diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index ed9fc6b8..adcdad12 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -1458,7 +1458,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "newMessageInFluffyChat": "New message in FluffyChat",
+  "newMessageInFluffyChat": "💬 New message in FluffyChat",
   "@newMessageInFluffyChat": {
     "type": "text",
     "placeholders": {}
@@ -2068,35 +2068,35 @@
     "type": "text",
     "placeholders": {}
   },
-  "sentAFile": "{username} sent a file",
+  "sentAFile": "📁 {username} sent a file",
   "@sentAFile": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "sentAnAudio": "{username} sent an audio",
+  "sentAnAudio": "🎤 {username} sent an audio",
   "@sentAnAudio": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "sentAPicture": "{username} sent a picture",
+  "sentAPicture": "🖼️ {username} sent a picture",
   "@sentAPicture": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "sentASticker": "{username} sent a sticker",
+  "sentASticker": "😊 {username} sent a sticker",
   "@sentASticker": {
     "type": "text",
     "placeholders": {
       "username": {}
     }
   },
-  "sentAVideo": "{username} sent a video",
+  "sentAVideo": "🎥 {username} sent a video",
   "@sentAVideo": {
     "type": "text",
     "placeholders": {
diff --git a/lib/utils/push_helper.dart b/lib/utils/push_helper.dart
index d3db5473..9384f0d7 100644
--- a/lib/utils/push_helper.dart
+++ b/lib/utils/push_helper.dart
@@ -141,14 +141,16 @@ Future<void> _tryPushHelper(
   final matrixLocals = MatrixLocals(l10n);
 
   // Calculate the body
-  final body = await event.calcLocalizedBody(
-    matrixLocals,
-    plaintextBody: true,
-    withSenderNamePrefix: false,
-    hideReply: true,
-    hideEdit: true,
-    removeMarkdown: true,
-  );
+  final body = event.type == EventTypes.Encrypted
+      ? l10n.newMessageInFluffyChat
+      : await event.calcLocalizedBody(
+          matrixLocals,
+          plaintextBody: true,
+          withSenderNamePrefix: false,
+          hideReply: true,
+          hideEdit: true,
+          removeMarkdown: true,
+        );
 
   // The person object for the android message style notification
   final avatar = event.room.avatar