diff --git a/res/layout/view_user.xml b/res/layout/view_user.xml
index 34ffd6947a..a0d51412de 100644
--- a/res/layout/view_user.xml
+++ b/res/layout/view_user.xml
@@ -21,20 +21,17 @@
 
         <TextView
             android:id="@+id/nameTextView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/medium_spacing"
             android:maxLines="1"
+            android:gravity="left"
             android:ellipsize="end"
             android:textSize="@dimen/medium_font_size"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Spiderman" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
+            android:text="Spiderman"
+            android:layout_weight="1"/>
 
         <ImageView
             android:id="@+id/actionIndicatorImageView"
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index fb56fbca52..74dc63dd15 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -290,6 +290,10 @@ public class ConversationItem extends LinearLayout
       }
     }
 
+    if (hasThumbnail(messageRecord) && messageRecord.getDisplayBody(context).length() > 0) {
+      ViewUtil.updateLayoutParams(bodyText, getAvailableMessageBubbleWidth(bodyText), ViewGroup.LayoutParams.WRAP_CONTENT);
+    }
+
     ConversationItemFooter activeFooter   = getActiveFooter(messageRecord);
     int                    availableWidth = getAvailableMessageBubbleWidth(footer);
 
diff --git a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 0183fdf108..450607e14a 100644
--- a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -51,6 +51,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
+import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.IncomingMessageObserver;
@@ -60,6 +61,7 @@ import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder;
 import org.whispersystems.signalservice.internal.util.Util;
+import org.whispersystems.signalservice.loki.protocol.mentions.Mention;
 
 import java.util.HashSet;
 import java.util.List;
@@ -311,7 +313,8 @@ public class DefaultMessageNotifier implements MessageNotifier {
     builder.setThread(notifications.get(0).getRecipient());
     builder.setMessageCount(notificationState.getMessageCount());
     builder.setPrimaryMessageBody(recipient, notifications.get(0).getIndividualRecipient(),
-                                  notifications.get(0).getText(), notifications.get(0).getSlideDeck());
+                                  MentionUtilities.highlightMentions(notifications.get(0).getText(), notifications.get(0).getThreadId(), context),
+                                  notifications.get(0).getSlideDeck());
     builder.setContentIntent(notifications.get(0).getPendingIntent(context));
     builder.setDeleteIntent(notificationState.getDeleteIntent(context));
     builder.setOnlyAlertOnce(!signal);
@@ -390,13 +393,14 @@ public class DefaultMessageNotifier implements MessageNotifier {
 
     while(iterator.hasPrevious()) {
       NotificationItem item = iterator.previous();
-      builder.addMessageBody(item.getIndividualRecipient(), item.getRecipient(), item.getText());
+      builder.addMessageBody(item.getIndividualRecipient(), item.getRecipient(),
+                             MentionUtilities.highlightMentions(item.getText(), item.getThreadId(), context));
     }
 
     if (signal) {
       builder.setAlarms(notificationState.getRingtone(context), notificationState.getVibrate());
       builder.setTicker(notifications.get(0).getIndividualRecipient(),
-                        notifications.get(0).getText());
+                        MentionUtilities.highlightMentions(notifications.get(0).getText(), notifications.get(0).getThreadId(), context));
     }
 
     Notification notification = builder.build();