diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fb5c502b4..0058fca71 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -208,7 +208,7 @@
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".MediaOverviewActivity"
+    <activity android:name=".ProfileActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 479ead73c..f4528d3d4 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -539,8 +539,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void handleProfile() {
     if(chatId != DcChat.DC_CHAT_ID_DEADDROP) {
-      Intent intent = new Intent(this, MediaOverviewActivity.class);
-      intent.putExtra(MediaOverviewActivity.ADDRESS_EXTRA, recipient.getAddress());
+      Intent intent = new Intent(this, ProfileActivity.class);
+      intent.putExtra(ProfileActivity.ADDRESS_EXTRA, recipient.getAddress());
       startActivity(intent);
     }
   }
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 63098ae9b..69439ee2d 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -247,8 +247,8 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void showOverview() {
-    Intent intent = new Intent(this, MediaOverviewActivity.class);
-    intent.putExtra(MediaOverviewActivity.ADDRESS_EXTRA, conversationRecipient.getAddress());
+    Intent intent = new Intent(this, ProfileActivity.class);
+    intent.putExtra(ProfileActivity.ADDRESS_EXTRA, conversationRecipient.getAddress());
     startActivity(intent);
   }
 
diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java
similarity index 98%
rename from src/org/thoughtcrime/securesms/MediaOverviewActivity.java
rename to src/org/thoughtcrime/securesms/ProfileActivity.java
index 926ab84bf..4af5387a3 100644
--- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/src/org/thoughtcrime/securesms/ProfileActivity.java
@@ -53,10 +53,10 @@ import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import java.util.Collection;
 import java.util.Locale;
 
-public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity  {
+public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
 
   @SuppressWarnings("unused")
-  private final static String TAG = MediaOverviewActivity.class.getSimpleName();
+  private final static String TAG = ProfileActivity.class.getSimpleName();
 
   public static final String ADDRESS_EXTRA   = "address";