diff --git a/res/values/strings.xml b/res/values/strings.xml
index b784cd2b8..190d6ac8d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -113,6 +113,7 @@
     <string name="audio">Audio</string>
     <string name="voice_message">Voice message</string>
     <string name="forwarded_message">Forwarded message</string>
+    <string name="forwarded_by">Forwarded by %1$s</string>
     <string name="video">Video</string>
     <string name="documents">Documents</string>
     <string name="contact">Contact</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 264ee1c39..194ba44a9 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -654,12 +654,15 @@ public class ConversationItem extends LinearLayout
 
   private void setGroupMessageStatus() {
     if (messageRecord.isForwarded()) {
-      this.groupSender.setText(context.getString(R.string.forwarded_message));
+      if (groupThread && !messageRecord.isOutgoing() && dcContact !=null) {
+        this.groupSender.setText(context.getString(R.string.forwarded_by, messageRecord.getSenderName(dcContact)));
+      } 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.setTextColor(dcContact.getArgbColor());
     }
   }
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index d448ea4ff..4d7bcb2e6 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -143,8 +143,13 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
       authorView.setVisibility(GONE);
       quoteBarView.setBackgroundColor(getForwardedColor());
     } else if (quotedMsg.isForwarded()) {
+      DcContact contact = author.getDcContact();
       authorView.setVisibility(VISIBLE);
-      authorView.setText(getContext().getString(R.string.forwarded_message));
+      if (contact == null) {
+        authorView.setText(getContext().getString(R.string.forwarded_message));
+      } else {
+        authorView.setText(getContext().getString(R.string.forwarded_by, quotedMsg.getSenderName(contact)));
+      }
       authorView.setTextColor(getForwardedColor());
       quoteBarView.setBackgroundColor(getForwardedColor());
     } else {