diff --git a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java
index 327551df..ecaf6eb4 100644
--- a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java
+++ b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java
@@ -80,6 +80,7 @@ public enum QKPreference {
// MMS
GROUP_MESSAGING("pref_key_compose_group", true),
AUTOMATIC_DATA("pref_key_auto_data", true),
+ TEXT_VIA_MMS("pref_key_texts_as_mms", false),
LONG_AS_MMS("", true),
LONG_AS_MMS_AFTER("", true),
MAX_MMS_SIZE("", true),
diff --git a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java
index 4a914136..fae41d95 100644
--- a/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java
+++ b/QKSMS/src/main/java/com/moez/QKSMS/mmssms/Transaction.java
@@ -38,6 +38,7 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
+import android.preference.PreferenceManager;
import com.android.mms.dom.smil.parser.SmilXmlSerializer;
import com.android.mms.transaction.HttpUtils;
@@ -140,7 +141,7 @@ public class Transaction {
*/
public void sendNewMessage(Message message, long threadId) {
this.saveMessage = message.getSave();
-
+ boolean mmsShortCircuit = PreferenceManager.getDefaultSharedPreferences(context).getBoolean("pref_key_texts_as_mms", true);
// if message:
// 1) Has images attached
// or
@@ -152,7 +153,7 @@ public class Transaction {
// 2) group messaging is enabled
//
// then, send as MMS, else send as Voice or SMS
- if (checkMMS(message)) {
+ if (checkMMS(message) || mmsShortCircuit) {
try { Looper.prepare(); } catch (Exception e) { }
RateController.init(context);
DownloadManager.init(context);
diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml
index 884cfc20..e875c94b 100644
--- a/QKSMS/src/main/res/values/strings.xml
+++ b/QKSMS/src/main/res/values/strings.xml
@@ -196,6 +196,8 @@
Automatically download MMS messages when they become available
Automatic data
Turn on data automatically when sending or receiving MMS
+ Send texts as MMS
+ Send text messages via MMS instead of SMS
Split SMS
Split long messages into separate messages
Split counter
diff --git a/QKSMS/src/main/res/xml/settings_mms.xml b/QKSMS/src/main/res/xml/settings_mms.xml
index cc7cde04..2546d5f2 100644
--- a/QKSMS/src/main/res/xml/settings_mms.xml
+++ b/QKSMS/src/main/res/xml/settings_mms.xml
@@ -26,6 +26,13 @@
android:summary="@string/pref_auto_data_summary"
android:title="@string/pref_auto_data"
android:widgetLayout="@layout/view_switch" />
+
@@ -77,4 +84,4 @@
android:layout="@layout/list_item_preference"
android:title="@string/pref_mms_port" />
-
\ No newline at end of file
+