diff --git a/misc/mail-notify b/misc/mail-notify
index 574fa34..085c651 100755
--- a/misc/mail-notify
+++ b/misc/mail-notify
@@ -18,6 +18,8 @@ def from(msg: MimeMessage): String =
     .map(addr => Option(addr.getPersonal).map(_.replace("&", "&")).getOrElse(addr.getAddress))
     .getOrElse("unknown")
 
+def subject(msg: MimeMessage): String =
+  Option(msg.getSubject).map(_.replace("&", "&")).getOrElse("")
 
 case class MailInfo(from: String, subject: String, mailbox: String)
 object MailInfo:
@@ -26,7 +28,7 @@ object MailInfo:
     val address = msg.getFrom.head.asInstanceOf[InternetAddress]
     MailInfo(
       from(msg),
-      msg.getSubject.replace("&", "&"),
+      subject(msg),
       (p/up/up relativeTo maildir).toString
     )