1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index 826b5172d..fe97344c0 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -59,10 +59,13 @@ import de.pixart.messenger.ui.EditAccountActivity;
 import de.pixart.messenger.ui.TimePreference;
 import de.pixart.messenger.utils.AccountUtils;
 import de.pixart.messenger.utils.Compatibility;
+import de.pixart.messenger.utils.EmojiWrapper;
 import de.pixart.messenger.utils.GeoHelper;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.xmpp.XmppConnection;
 
+import static de.pixart.messenger.ui.util.MyLinkify.replaceYoutube;
+
 public class NotificationService {
 
     public static final Object CATCHUP_LOCK = new Object();
@@ -705,14 +708,14 @@ public class NotificationService {
                 SpannableString styledString;
                 for (Message message : messages) {
                     final SpannableString name = UIHelper.getColoredUsername(mXmppConnectionService, message);
-                    styledString = new SpannableString(name + ": " + message.getBody());
+                    styledString = new SpannableString(name + ": " + EmojiWrapper.transform(replaceYoutube(mXmppConnectionService, message.getBody())));
                     style.addLine(styledString);
                 }
                 builder.setStyle(style);
                 int count = messages.size();
                 if (count == 1) {
                     final SpannableString name = UIHelper.getColoredUsername(mXmppConnectionService, messages.get(0));
-                    styledString = new SpannableString(name + ": " + messages.get(0).getBody());
+                    styledString = new SpannableString(name + ": " + EmojiWrapper.transform(replaceYoutube(mXmppConnectionService, messages.get(0).getBody())));
                     builder.setContentText(styledString);
                     builder.setTicker(styledString);
                 } else {