diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 7be4b3ce4..78aa43038 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -307,6 +307,7 @@ public class MessageNotifier {
     builder.setGroup(NOTIFICATION_GROUP);
     builder.setDeleteIntent(notificationState.getDeleteIntent(context));
     builder.setOnlyAlertOnce(!signal);
+    builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
 
     long timestamp = notifications.get(0).getTimestamp();
     if (timestamp != 0) builder.setWhen(timestamp);
@@ -331,8 +332,8 @@ public class MessageNotifier {
                         notifications.get(0).getText());
     }
 
-    if (bundled) {
-      builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
+    if (!bundled) {
+      builder.setGroupSummary(true);
     }
 
     NotificationManagerCompat.from(context).notify(notificationId, builder.build());