diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 46829c35d..cd3f9f784 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1156,7 +1156,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         if ("cache".equals(getAttribute("storeMedia"))) return true;
         if ("shared".equals(getAttribute("storeMedia"))) return false;
         if (mode == Conversation.MODE_MULTI && !mucOptions.isPrivateAndNonAnonymous()) return true;
-        return false;
+        return true;
     }
 
     public boolean setAttribute(String key, boolean value) {
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 0908dc36a..9678962cf 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -202,7 +202,7 @@
                             android:layout_height="wrap_content">
 
                             <TextView
-                                android:text="Store media only in cache"
+                                android:text="@string/store_media_only_in_cache"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentStart="true"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index baf51dba4..361e30f6a 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -435,7 +435,7 @@
                             android:layout_height="wrap_content">
 
                             <TextView
-                                android:text="Store media only in cache"
+                                android:text="@string/store_media_only_in_cache"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentStart="true"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 57060ab90..56d1bee59 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1081,4 +1081,5 @@
     <string name="block_avatar">Block avatar</string>
     <string name="pref_show_less_avatars">Show less avatars</string>
     <string name="pref_show_less_avatars_summary">Show only needed avatars in the chats</string>
+    <string name="store_media_only_in_cache">Store media only in cache</string>
 </resources>