diff --git a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
index b90d0ffe0..84c6c38f3 100644
--- a/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
+++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
@@ -4962,7 +4962,7 @@ public class MessagingController implements Runnable {
                     subBuilder.setAutoCancel(true); // summary closes all, stacked only itself
 
                     // set content
-                    setNotificationContent(context, m, getMessageSender(context, account, message), getMessageSubject(context, message), subBuilder, accountDescr);
+                    setNotificationContent(context, m, getMessageSender(context, account, m), getMessageSubject(context, m), subBuilder, accountDescr);
 
 
                     // set actions
@@ -5151,7 +5151,6 @@ public class MessagingController implements Runnable {
         if (preview != null) {
             style.bigText(preview);
         }
-        builder.setContentTitle(sender);
         builder.setContentText(subject);
         builder.setSubText(accountDescr);
         builder.setContentTitle(sender);