diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a38282d48..494b7b18e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -300,6 +300,7 @@
     <string name="pref_blacklist_calendars_summary">Blacklisted calendars will not be synced to the device</string>
     <string name="pref_header_cannned_messages">Canned messages</string>
     <string name="pref_title_canned_replies">Replies</string>
+    <string name="pref_canned_message">Message</string>
     <string name="pref_summary_canned_replies">Reply from the watch using preset messages</string>
     <string name="pref_title_canned_reply_suffix">Common suffix</string>
     <string name="pref_title_canned_messages_dismisscall">Call Dismissal</string>
diff --git a/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml b/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
index 6c8f50b67..8722b5640 100644
--- a/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
+++ b/app/src/main/res/xml/devicesettings_canned_dismisscall_16.xml
@@ -5,93 +5,109 @@
         android:icon="@drawable/ic_phone_msg"
         android:key="screen_canned_messages_dismisscall"
         android:persistent="false"
-        android:title="@string/pref_title_canned_messages_dismisscall"
-        android:summary="@string/pref_summary_canned_messages_dismisscall">
+        android:summary="@string/pref_summary_canned_messages_dismisscall"
+        android:title="@string/pref_title_canned_messages_dismisscall">
         <Preference
             android:icon="@drawable/ic_refresh"
             android:key="canned_messages_dismisscall_send"
-            android:title="@string/pref_title_canned_messages_set"
-            android:summary="@string/pref_summary_canned_messages_set"/>
+            android:summary="@string/pref_summary_canned_messages_set"
+            android:title="@string/pref_title_canned_messages_set" />
 
         <PreferenceCategory
             android:key="pref_key_canned_reply_messages"
             android:title="@string/pref_header_cannned_messages">
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_1"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_2"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_3"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_4"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_5"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_6"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_7"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_8"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_9"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_10"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_11"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_12"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_13"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_14"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_15"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_message_dismisscall_16"
                 android:maxLength="64"
diff --git a/app/src/main/res/xml/devicesettings_canned_reply_16.xml b/app/src/main/res/xml/devicesettings_canned_reply_16.xml
index 22698ce3e..50e2455d8 100644
--- a/app/src/main/res/xml/devicesettings_canned_reply_16.xml
+++ b/app/src/main/res/xml/devicesettings_canned_reply_16.xml
@@ -10,8 +10,8 @@
         <Preference
             android:icon="@drawable/ic_refresh"
             android:key="canned_messages_generic_send"
-            android:title="@string/pref_title_canned_messages_set"
-            android:summary="@string/pref_summary_canned_messages_set"/>
+            android:summary="@string/pref_summary_canned_messages_set"
+            android:title="@string/pref_title_canned_messages_set" />
 
         <EditTextPreference
             android:defaultValue=" (canned reply)"
@@ -24,81 +24,97 @@
             android:key="pref_key_canned_reply_messages"
             android:title="@string/pref_header_cannned_messages">
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_1"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_2"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_3"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_4"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_5"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_6"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_7"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_8"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_9"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_10"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_11"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_12"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_13"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_14"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_15"
                 android:maxLength="64"
                 app:useSimpleSummaryProvider="true" />
             <EditTextPreference
+                android:dialogTitle="@string/pref_canned_message"
                 android:icon="@drawable/ic_message_outline"
                 android:key="canned_reply_16"
                 android:maxLength="64"