diff --git a/src/com/b44t/messenger/DcMsg.java b/src/com/b44t/messenger/DcMsg.java
index 657bb5116..c5b8d9feb 100644
--- a/src/com/b44t/messenger/DcMsg.java
+++ b/src/com/b44t/messenger/DcMsg.java
@@ -131,10 +131,10 @@ public class DcMsg {
     public native String  getError           ();
     private native @Nullable String getOverrideSenderName();
 
-    public @NonNull String getSenderName(@NonNull DcContact dcContact) {
+    public @NonNull String getSenderName(@NonNull DcContact dcContact, boolean markOverride) {
         String overrideName = getOverrideSenderName();
         if (overrideName != null) {
-            return overrideName;
+            return (markOverride ? "~" : "") + overrideName;
         } else {
             return dcContact.getDisplayName();
         }
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index 022f345ac..ad8f71b51 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -428,7 +428,7 @@ public class ConversationFragment extends Fragment
 
             if (msg.getFromId() != prevMsg.getFromId() && !singleMsg) {
                 DcContact contact = dcContext.getContact(msg.getFromId());
-                result.append(msg.getSenderName(contact)).append(":\n");
+                result.append(msg.getSenderName(contact, false)).append(":\n");
             }
             if (msg.getType() == DcMsg.DC_MSG_TEXT || (singleMsg && !msg.getText().isEmpty())) {
                 result.append(msg.getText());
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 194ba44a9..6fa23f9cd 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -655,14 +655,14 @@ public class ConversationItem extends LinearLayout
   private void setGroupMessageStatus() {
     if (messageRecord.isForwarded()) {
       if (groupThread && !messageRecord.isOutgoing() && dcContact !=null) {
-        this.groupSender.setText(context.getString(R.string.forwarded_by, messageRecord.getSenderName(dcContact)));
+        this.groupSender.setText(context.getString(R.string.forwarded_by, messageRecord.getSenderName(dcContact, false)));
       } else {
         this.groupSender.setText(context.getString(R.string.forwarded_message));
       }
       this.groupSender.setTextColor(context.getResources().getColor(R.color.unknown_sender));
     }
     else if (groupThread && !messageRecord.isOutgoing() && dcContact !=null) {
-      this.groupSender.setText(messageRecord.getSenderName(dcContact));
+      this.groupSender.setText(messageRecord.getSenderName(dcContact, true));
       this.groupSender.setTextColor(dcContact.getArgbColor());
     }
   }
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 54f468e09..dc9a1f126 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -490,7 +490,7 @@ public class ConversationListFragment extends Fragment
         answerBlock = context.getString(R.string.block);
       } else {
         DcContact dcContact = dcContext.getContact(dcMsg.getFromId());
-        question = context.getString(R.string.ask_start_chat_with, dcMsg.getSenderName(dcContact));
+        question = context.getString(R.string.ask_start_chat_with, dcMsg.getSenderName(dcContact, false));
         answerBlock = context.getString(R.string.menu_block_contact);
       }
     }
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index e2198de8c..125208ec6 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -148,7 +148,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
       if (contact == null) {
         authorView.setText(getContext().getString(R.string.forwarded_message));
       } else {
-        authorView.setText(getContext().getString(R.string.forwarded_by, quotedMsg.getSenderName(contact)));
+        authorView.setText(getContext().getString(R.string.forwarded_by, quotedMsg.getSenderName(contact, false)));
       }
       authorView.setTextColor(getForwardedColor());
       quoteBarView.setBackgroundColor(getForwardedColor());
@@ -159,7 +159,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
         quoteBarView.setBackgroundColor(getForwardedColor());
       } else {
         authorView.setVisibility(VISIBLE);
-        authorView.setText(quotedMsg.getSenderName(contact));
+        authorView.setText(quotedMsg.getSenderName(contact, false));
         authorView.setTextColor(contact.getArgbColor());
         quoteBarView.setBackgroundColor(contact.getArgbColor());
       }
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
index 63554ec08..81197e3ee 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
@@ -331,7 +331,7 @@ public class NotificationCenter {
             DcMsg dcMsg = dcContext.getMsg(msgId);
             String line = privacy.isDisplayMessage()? dcMsg.getSummarytext(2000) : context.getString(R.string.notify_new_message);
             if (dcChat.isGroup() && privacy.isDisplayContact()) {
-                line = dcMsg.getSenderName(dcContext.getContact(dcMsg.getFromId())) + ": " + line;
+                line = dcMsg.getSenderName(dcContext.getContact(dcMsg.getFromId()), false) + ": " + line;
             }
 
             // play signal?
@@ -368,7 +368,7 @@ public class NotificationCenter {
             // prepend the sender in the ticker also for one-to-one chats (for group-chats, this is already done)
             String tickerLine = line;
             if (!dcChat.isGroup() && privacy.isDisplayContact()) {
-                line = dcMsg.getSenderName(dcContext.getContact(dcMsg.getFromId())) + ": " + line;
+                line = dcMsg.getSenderName(dcContext.getContact(dcMsg.getFromId()), false) + ": " + line;
             }
             builder.setTicker(tickerLine);