diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 993edddc7..aba58e9e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -212,9 +212,12 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
             from = getString(R.string.note_to_self);
           } else {
             to = threadRecipient.getDisplayName(this);
+            if (mediaItem.outgoing) {
+              return getString(R.string.MediaPreviewActivity_you_to_s, to);
+            }
           }
         } else {
-          to = getString(R.string.MediaPreviewActivity_you);
+          return getString(R.string.MediaPreviewActivity_s_to_you, from);
         }
       }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b8095784..c211b3367 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1846,6 +1846,10 @@
     <string name="MediaPreviewActivity_media_delete_confirmation_title">Delete message?</string>
     <string name="MediaPreviewActivity_media_delete_confirmation_message">This will permanently delete this message.</string>
     <string name="MediaPreviewActivity_s_to_s">%1$s to %2$s</string>
+    <!-- All media preview title when viewing media send by you to another recipient (allows changing of 'You' based on context) -->
+    <string name="MediaPreviewActivity_you_to_s">You to %1$s</string>
+    <!-- ALl media preview title when viewing media sent by another recipient to you (allows changing of 'You' based on context) -->
+    <string name="MediaPreviewActivity_s_to_you">%1$s to You</string>
     <string name="MediaPreviewActivity_media_no_longer_available">Media no longer available.</string>
     <string name="MediaPreviewActivity_cant_find_an_app_able_to_share_this_media">Can\'t find an app able to share this media.</string>