diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 754ec17c..008ec142 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -120,7 +120,7 @@ class ThreadActivity : SimpleActivity() {
     override fun onPause() {
         super.onPause()
 
-        if (thread_type_message.value != "" && attachmentUris.isEmpty()) {
+        if (thread_type_message.value != "" && attachmentSelections.isEmpty()) {
             saveSmsDraft(thread_type_message.value, threadId)
         } else {
             deleteSmsDraft(threadId)
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index bb0a4c76..ac27293c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -49,14 +49,7 @@
     <string name="sender_and_message">Sender and message</string>
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
-    <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
-    <string name="mms_file_size_limit_none">No limit</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Proč aplikace vyžaduje přístup k internetu?</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index ac2d26b1..a45a7033 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -49,14 +49,7 @@
     <string name="sender_and_message">Sender and message</string>
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
-    <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
-    <string name="mms_file_size_limit_none">No limit</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Hvorfor kræver appen adgang til internettet?</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5481ca80..9c90bcfb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 547c4d37..997169a9 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Αποστολέας μόνο</string>
     <string name="enable_delivery_reports">Ενεργοποίηση αναφορών παράδοσης</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2389eb98..67d182cb 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b8072c06..2e782726 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e6ecfde4..450af159 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 37d9d7c3..1f276fa3 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ecafa2b1..5baa593b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Solo mittente</string>
     <string name="enable_delivery_reports">Abilita conferma di consegna</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 75363e93..871b8e60 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index aef38a4a..8356b483 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index f66da540..dbec29f0 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2e49c0e6..761add6d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Alleen afzender</string>
     <string name="enable_delivery_reports">Bezorgingsrapporten inschakelen</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 97d8d62c..57ad858d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -52,12 +52,6 @@
     <string name="sender_only">Tylko nadawca</string>
     <string name="enable_delivery_reports">Włącz raporty doręczeń</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 78054a60..793f5c39 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f5f6ae41..4695783b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -52,12 +52,6 @@
     <string name="sender_only">Только отправитель</string>
     <string name="enable_delivery_reports">Использовать отчёты о доставке</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index e47bfef1..60bcc6d8 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -52,12 +52,6 @@
     <string name="sender_only">Iba odosielateľ</string>
     <string name="enable_delivery_reports">Povoliť správy o doručení</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c5a1c270..04bc32ec 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index a1e4696c..3527c5c4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 89cdbc30..08ed9cd9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -50,12 +50,6 @@
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
     <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
     <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 24f6140e..244c41e4 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -2,4 +2,11 @@
 
     <string name="package_name">com.simplemobiletools.smsmessenger</string>
 
+    <string name="mms_file_size_limit_100kb">100KB</string>
+    <string name="mms_file_size_limit_200kb">200KB</string>
+    <string name="mms_file_size_limit_300kb">300KB</string>
+    <string name="mms_file_size_limit_600kb">600KB</string>
+    <string name="mms_file_size_limit_1mb">1MB</string>
+    <string name="mms_file_size_limit_2mb">2MB</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8454a015..e6273a47 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,14 +49,7 @@
     <string name="sender_and_message">Sender and message</string>
     <string name="sender_only">Sender only</string>
     <string name="enable_delivery_reports">Enable delivery reports</string>
-    <string name="mms_file_size_limit">Resize sent MMS images</string>
-    <string name="mms_file_size_limit_100kb">100KB</string>
-    <string name="mms_file_size_limit_200kb">200KB</string>
-    <string name="mms_file_size_limit_300kb">300KB</string>
-    <string name="mms_file_size_limit_600kb">600KB</string>
-    <string name="mms_file_size_limit_1mb">1MB</string>
-    <string name="mms_file_size_limit_2mb">2MB</string>
-    <string name="mms_file_size_limit_none">No limit</string>
+    <string name="mms_file_size_limit">Resize sent MMS images</string>    <string name="mms_file_size_limit_none">No limit</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Why does the app require access to the internet?</string>