diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
index 407d3e594aa35bf75374625074d782176278f13b..0d7e52239cb6aca12ad33495415faf5e7eafd7ad 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasseldroidNotificationManager.kt
@@ -180,6 +180,7 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
           replyPendingIntent
         ).addRemoteInput(remoteInput).build()
       )
+      .setWhen(notifications.last().time.toEpochMilli())
       .apply {
         if (bufferInfo.type.hasFlag(Buffer_Type.QueryBuffer)) {
           notifications.lastOrNull()?.avatar?.let {
@@ -187,8 +188,7 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
           }
         }
       }
-    return Handle(bufferInfo.bufferId,
-                  notification)
+    return Handle(bufferInfo.bufferId, notification)
   }
 
   fun notificationBackground(): Handle {
@@ -218,8 +218,7 @@ class QuasseldroidNotificationManager @Inject constructor(private val context: C
       .setSmallIcon(R.mipmap.ic_logo)
       .setColor(context.getColorCompat(R.color.colorPrimary))
       .setPriority(NotificationCompat.PRIORITY_MIN)
-    return Handle(BACKGROUND_NOTIFICATION_ID,
-                  notification)
+    return Handle(BACKGROUND_NOTIFICATION_ID, notification)
   }
 
   fun notify(handle: Handle) {