diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java
index a1dd25ebf..80ce782bd 100644
--- a/src/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/ProfileActivity.java
@@ -50,7 +50,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.Prefs;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
@@ -308,7 +307,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
       View                  view    = inflater.inflate(R.layout.profile_settings_fragment, container, false);
-      MediaDocumentsAdapter adapter = new MediaDocumentsAdapter(getContext(), null, locale);
+      ProfileDocumentsAdapter adapter = new ProfileDocumentsAdapter(getContext(), null, locale);
 
       this.recyclerView  = ViewUtil.findById(view, R.id.recycler_view);
 
@@ -343,7 +342,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
   //////////////////////////////////////////////////////////////////////////////////////////////////
 
   public static class ProfileGalleryFragment
-      extends Fragment implements LoaderManager.LoaderCallbacks<BucketedThreadMedia>, MediaGalleryAdapter.ItemClickListener
+      extends Fragment implements LoaderManager.LoaderCallbacks<BucketedThreadMedia>, ProfileGalleryAdapter.ItemClickListener
   {
     protected TextView                    noMedia;
     protected RecyclerView                recyclerView;
@@ -377,7 +376,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
       this.noMedia      = ViewUtil.findById(view, R.id.no_images);
       this.gridManager  = new StickyHeaderGridLayoutManager(getResources().getInteger(R.integer.profile_cols));
 
-      this.recyclerView.setAdapter(new MediaGalleryAdapter(getContext(),
+      this.recyclerView.setAdapter(new ProfileGalleryAdapter(getContext(),
                                                            GlideApp.with(this),
                                                            new BucketedThreadMedia(getContext()),
                                                            locale,
@@ -404,8 +403,8 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
 
     @Override
     public void onLoadFinished(Loader<BucketedThreadMedia> loader, BucketedThreadMedia bucketedThreadMedia) {
-      ((MediaGalleryAdapter) recyclerView.getAdapter()).setMedia(bucketedThreadMedia);
-      ((MediaGalleryAdapter) recyclerView.getAdapter()).notifyAllSectionsDataSetChanged();
+      ((ProfileGalleryAdapter) recyclerView.getAdapter()).setMedia(bucketedThreadMedia);
+      ((ProfileGalleryAdapter) recyclerView.getAdapter()).notifyAllSectionsDataSetChanged();
 
       noMedia.setVisibility(recyclerView.getAdapter().getItemCount() > 0 ? View.GONE : View.VISIBLE);
       getActivity().invalidateOptionsMenu();
@@ -413,7 +412,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
 
     @Override
     public void onLoaderReset(Loader<BucketedThreadMedia> cursorLoader) {
-      ((MediaGalleryAdapter) recyclerView.getAdapter()).setMedia(new BucketedThreadMedia(getContext()));
+      ((ProfileGalleryAdapter) recyclerView.getAdapter()).setMedia(new BucketedThreadMedia(getContext()));
     }
 
     @Override
@@ -426,7 +425,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
     }
 
     private void handleMediaMultiSelectClick(@NonNull DcMsg mediaRecord) {
-      MediaGalleryAdapter adapter = getListAdapter();
+      ProfileGalleryAdapter adapter = getListAdapter();
 
       adapter.toggleSelection(mediaRecord);
       if (adapter.getSelectedMediaCount() == 0) {
@@ -458,7 +457,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
     @Override
     public void onMediaLongClicked(DcMsg mediaRecord) {
       if (actionMode == null) {
-        ((MediaGalleryAdapter) recyclerView.getAdapter()).toggleSelection(mediaRecord);
+        ((ProfileGalleryAdapter) recyclerView.getAdapter()).toggleSelection(mediaRecord);
         recyclerView.getAdapter().notifyDataSetChanged();
 
         actionMode = ((AppCompatActivity) getActivity()).startSupportActionMode(actionModeCallback);
@@ -501,8 +500,8 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
       builder.show();
     }
 
-    private MediaGalleryAdapter getListAdapter() {
-      return (MediaGalleryAdapter) recyclerView.getAdapter();
+    private ProfileGalleryAdapter getListAdapter() {
+      return (ProfileGalleryAdapter) recyclerView.getAdapter();
     }
 
     private class ActionModeCallback implements ActionMode.Callback {
@@ -580,7 +579,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
       View                  view    = inflater.inflate(R.layout.profile_documents_fragment, container, false);
-      MediaDocumentsAdapter adapter = new MediaDocumentsAdapter(getContext(), null, locale);
+      ProfileDocumentsAdapter adapter = new ProfileDocumentsAdapter(getContext(), null, locale);
 
       this.recyclerView  = ViewUtil.findById(view, R.id.recycler_view);
       this.noMedia       = ViewUtil.findById(view, R.id.no_documents);
diff --git a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
similarity index 91%
rename from src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
rename to src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
index 11ee0ef40..adbeed812 100644
--- a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
+++ b/src/org/thoughtcrime/securesms/ProfileDocumentsAdapter.java
@@ -11,8 +11,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.MediaDocumentsAdapter.HeaderViewHolder;
-import org.thoughtcrime.securesms.MediaDocumentsAdapter.ViewHolder;
+import org.thoughtcrime.securesms.ProfileDocumentsAdapter.HeaderViewHolder;
+import org.thoughtcrime.securesms.ProfileDocumentsAdapter.ViewHolder;
 import org.thoughtcrime.securesms.components.DocumentView;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -29,12 +29,12 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-public class MediaDocumentsAdapter extends CursorRecyclerViewAdapter<ViewHolder> implements StickyHeaderDecoration.StickyHeaderAdapter<HeaderViewHolder> {
+public class ProfileDocumentsAdapter extends CursorRecyclerViewAdapter<ViewHolder> implements StickyHeaderDecoration.StickyHeaderAdapter<HeaderViewHolder> {
 
   private final Calendar     calendar;
   private final Locale       locale;
 
-  MediaDocumentsAdapter(Context context, Cursor cursor, Locale locale) {
+  ProfileDocumentsAdapter(Context context, Cursor cursor, Locale locale) {
     super(context, cursor);
 
     this.calendar     = Calendar.getInstance();
diff --git a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java b/src/org/thoughtcrime/securesms/ProfileGalleryAdapter.java
similarity index 92%
rename from src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
rename to src/org/thoughtcrime/securesms/ProfileGalleryAdapter.java
index 7de48ec7b..fd88793d6 100644
--- a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
+++ b/src/org/thoughtcrime/securesms/ProfileGalleryAdapter.java
@@ -37,10 +37,10 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
-class MediaGalleryAdapter extends StickyHeaderGridAdapter {
+class ProfileGalleryAdapter extends StickyHeaderGridAdapter {
 
   @SuppressWarnings("unused")
-  private static final String TAG = MediaGalleryAdapter.class.getSimpleName();
+  private static final String TAG = ProfileGalleryAdapter.class.getSimpleName();
 
   private final Context             context;
   private final GlideRequests       glideRequests;
@@ -70,11 +70,11 @@ class MediaGalleryAdapter extends StickyHeaderGridAdapter {
     }
   }
 
-  MediaGalleryAdapter(@NonNull Context context,
-                      @NonNull GlideRequests glideRequests,
-                      BucketedThreadMedia media,
-                      Locale locale,
-                      ItemClickListener clickListener)
+  ProfileGalleryAdapter(@NonNull Context context,
+                        @NonNull GlideRequests glideRequests,
+                        BucketedThreadMedia media,
+                        Locale locale,
+                        ItemClickListener clickListener)
   {
     this.context           = context;
     this.glideRequests     = glideRequests;