diff --git a/app/src/main/java/org/linphone/chat/ChatActivity.java b/app/src/main/java/org/linphone/chat/ChatActivity.java
index f6971df8c..36da004ae 100644
--- a/app/src/main/java/org/linphone/chat/ChatActivity.java
+++ b/app/src/main/java/org/linphone/chat/ChatActivity.java
@@ -162,12 +162,18 @@ public class ChatActivity extends MainActivity {
             }
         }
 
-        if (sharedText != null || sharedFiles != null) {
-            mSharedText = sharedText;
-            mSharedFiles = sharedFiles;
-            Toast.makeText(this, R.string.toast_choose_chat_room_for_sharing, Toast.LENGTH_LONG)
-                    .show();
-            Log.i("[Chat Activity] Sharing arguments found: " + mSharedText + " / " + mSharedFiles);
+        if (!getResources().getBoolean(R.bool.disable_chat_send_file)) {
+            if (sharedText != null || sharedFiles != null) {
+                mSharedText = sharedText;
+                mSharedFiles = sharedFiles;
+                Toast.makeText(this, R.string.toast_choose_chat_room_for_sharing, Toast.LENGTH_LONG)
+                        .show();
+                Log.i(
+                        "[Chat Activity] Sharing arguments found: "
+                                + mSharedText
+                                + " / "
+                                + mSharedFiles);
+            }
         }
     }
 
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index fcb2b9077..3b2c8769d 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -258,6 +258,10 @@ public class ChatMessagesFragment extends Fragment
                         pickFile();
                     }
                 });
+        if (getResources().getBoolean(R.bool.disable_chat_send_file)) {
+            mAttachImageButton.setEnabled(false);
+            mAttachImageButton.setVisibility(View.GONE);
+        }
 
         mSendMessageButton = view.findViewById(R.id.send_message);
         mSendMessageButton.setEnabled(false);
diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
index 8210fc35b..d53479a1e 100644
--- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java
@@ -220,6 +220,14 @@ public class ChatRoomCreationFragment extends Fragment
             securityToggleOff.setVisibility(View.GONE);
         }
 
+        if (getResources().getBoolean(R.bool.force_end_to_end_encryption_in_chat)) {
+            mSecurityToggle.setChecked(true);
+            mSearchAdapter.setSecurityEnabled(true);
+            mSecurityToggle.setVisibility(View.GONE);
+            securityToggleOn.setVisibility(View.GONE);
+            securityToggleOff.setVisibility(View.GONE);
+        }
+
         LinearLayoutManager layoutManager =
                 new LinphoneLinearLayoutManager(getActivity().getApplicationContext());
 
diff --git a/app/src/main/res/values/non_localizable_custom.xml b/app/src/main/res/values/non_localizable_custom.xml
index 271e0433a..8ae43a34e 100644
--- a/app/src/main/res/values/non_localizable_custom.xml
+++ b/app/src/main/res/values/non_localizable_custom.xml
@@ -95,6 +95,7 @@
     <bool name="show_sip_uri_in_chat">false</bool>
     <bool name="hide_empty_one_to_one_chat_rooms">true</bool>
     <bool name="create_most_recent_chat_rooms_shortcuts">true</bool>
+    <bool name="force_end_to_end_encryption_in_chat">false</bool>
 
     <!-- Contacts -->
     <bool name="hide_contact_phone_numbers">false</bool>