DO NOT MERGE - Skip pie-platform-release (PPRL.190801.002) in master Bug: 139369544 Change-Id: I1757cf8c28c08681c5f8762ab29b9bd03a1c34ce

commit: f00746d5f0e009d7e2e74ac3c8527c19f3738735 [log] [tgz]
author: Xin Li <delphij@google.com> Tue Aug 13 16:36:39 2019 -0700
committer: Xin Li <delphij@google.com> Tue Aug 13 16:39:33 2019 -0700
tree: 4e162b1d4dfd51b3d85fcc3235b46a75b1a19a18
parent: 516e349b34789a1668a801c21e3184c525aae0ef [diff]
parent: ce31c9139309cf3ff1f8e02e06be470ff3c61b3d [diff]
diff --git a/Android.mk b/Android.mk
index 90e4984..ae10feb 100644
--- a/Android.mk
+++ b/Android.mk

@@ -24,19 +24,18 @@
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     libchips \
     libphotoviewer_appcompat \
-    android-support-compat \
-    android-support-media-compat \
-    android-support-core-utils \
-    android-support-core-ui \
-    android-support-fragment \
-    android-support-v7-appcompat \
-    android-support-v7-gridlayout \
-    android-support-v13 \
-    android-opt-bitmap \
-    android-opt-datetimepicker
+    androidx.core_core \
+    androidx.media_media \
+    androidx.legacy_legacy-support-core-utils \
+    androidx.legacy_legacy-support-core-ui \
+    androidx.fragment_fragment \
+    androidx.appcompat_appcompat \
+    androidx.gridlayout_gridlayout \
+    androidx.legacy_legacy-support-v13 \
+    android-opt-bitmap
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-annotations \
+    androidx.annotation_annotation \
     guava \
     android-common \
     owasp-html-sanitizer
@@ -51,12 +50,12 @@
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-ifeq (eng,$(TARGET_BUILD_VARIANT))
-  LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
-endif
+LOCAL_PROGUARD_FLAG_FILES += proguard-test.flags
 
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.mail.*,com.android.emailcommon.*,com.google.android.mail.*
 
+LOCAL_AAPT_FLAGS += --legacy
+
 include $(BUILD_PACKAGE)
 
 ##################################################

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b0bb881..e34a4fc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -27,7 +27,7 @@
     <uses-permission android:name="android.permission.NFC" />
 
     <!-- This needs to be present when we are doing unbundled releases. -->
-    <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="14" />
+    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="14" />
 
     <application
         android:icon="@mipmap/ic_launcher_mail"
@@ -175,7 +175,9 @@
                  android:permission="android.permission.BIND_REMOTEVIEWS"
                  android:exported="false" />
         <service android:name=".MailLogService"/>
-        <service android:name=".browse.EmlTempFileDeletionService" />
+        <service android:name=".browse.EmlTempFileDeletionService"
+                 android:permission="android.permission.BIND_JOB_SERVICE"
+                 android:exported="true" />
 
     </application>
 

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..ed1d60a
--- /dev/null
+++ b/OWNERS

@@ -0,0 +1,3 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+rtenneti@google.com

diff --git a/proguard.flags b/proguard.flags
index f88d37f..9e47361 100644
--- a/proguard.flags
+++ b/proguard.flags

@@ -2,8 +2,8 @@
 # Don't warn about those in case this app is linking against an older
 # platform version.  We know about them, and they are safe.
 
--dontwarn android.support.v4.**
--dontwarn android.support.v13.**
+-dontwarn androidx.core.**
+-dontwarn androidx.core.**
 -dontwarn com.android.ex.photo.**
 
 # keep names that are used by reflection, or from javascript
@@ -25,6 +25,6 @@
   *** setAnimatedHeightFraction(...);
 }
 
--keepclasseswithmembers class * extends com.android.mail.ui.ConversationSpecialItemView {
+-keepclasseswithmembers class * implements com.android.mail.ui.ConversationSpecialItemView {
   *** setAnimatedHeight(...);
 }

diff --git a/res/layout/conversation_message_header_details.xml b/res/layout/conversation_message_header_details.xml
index 31d0e26..6a599e9 100644
--- a/res/layout/conversation_message_header_details.xml
+++ b/res/layout/conversation_message_header_details.xml

@@ -15,7 +15,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.gridlayout.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/details_expanded_content"
     android:layout_width="match_parent"
@@ -152,4 +152,4 @@
         android:visibility="gone"
         style="@style/MessageDetailsValueStyle" />
 
-</android.support.v7.widget.GridLayout>
+</androidx.gridlayout.widget.GridLayout>

diff --git a/res/layout/mail_toolbar_view.xml b/res/layout/mail_toolbar_view.xml
index 78a5172..14952d3 100644
--- a/res/layout/mail_toolbar_view.xml
+++ b/res/layout/mail_toolbar_view.xml

@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mail_toolbar"
     android:layout_width="match_parent"

diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml
index 6705f55..d4008df 100644
--- a/res/layout/one_pane_activity.xml
+++ b/res/layout/one_pane_activity.xml

@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -57,4 +57,4 @@
         android:layout_height="match_parent"
         android:layout_gravity="start" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 96d6e41..5442a4f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Antwoord almal"</item>
     <item msgid="2758162027982270607">"Stuur aan"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%s</xliff:g>, het <xliff:g id="PERSON">%s</xliff:g> geskryf:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%1$s</xliff:g>, het <xliff:g id="PERSON">%2$s</xliff:g> geskryf:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Aangestuurde boodskap ----------&lt;br&gt;Van: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Datum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Onderwerp: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Aan: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Aangestuurde boodskap ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskap"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskappe"</item>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e1a08ab..aac9c16 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"ለሁሉም ምላሽ ስጥ"</item>
     <item msgid="2758162027982270607">"አስተላልፍ"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> ላይ <xliff:g id="PERSON">%s</xliff:g> እንዲህ ብሎ ጽፏል፦"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> ላይ <xliff:g id="PERSON">%2$s</xliff:g> እንዲህ ብሎ ጽፏል፦"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- የተላለፈ መልዕክት ----------&lt;br&gt;ከ፦ <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;ቀን: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;ርዕሰ ጕዳይ፦ <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;ለ <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- የተላለፈ መልዕክት ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"ካርቦን ቅጂ፦ <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክት"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶች"</item>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d504066..2d38adf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"رد على الكل"</item>
     <item msgid="2758162027982270607">"إعادة توجيه"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"بتاريخ <xliff:g id="DATE">%s</xliff:g>، جاء من <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"بتاريخ <xliff:g id="DATE">%1$s</xliff:g>، جاء من <xliff:g id="PERSON">%2$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"‏---------- الرسالة المعاد توجيهها ----------&lt;br&gt;من: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;التاريخ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;الموضوع: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;إلى: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- رسالة مُعاد توجيهها ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"‏نسخة إلى: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"رسالة جديدة (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
     <item quantity="other" msgid="3531683811183204615">"عدد الرسائل الجديدة: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 04362ae..b76ed8d 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Hamıya cavab"</item>
     <item msgid="2758162027982270607">"Yönləndirin"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> tarixində, <xliff:g id="PERSON">%s</xliff:g> yazıb:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> tarixində, <xliff:g id="PERSON">%2$s</xliff:g> yazıb:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Yönləndirilmiş mesaj ----------&lt;br&gt;From: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Tarix: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Mövzu: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Yönləndirilmiş mesaj ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Nüsxəni alan: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> yeni mesaj"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> yeni mesaj"</item>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 89fa320..098638f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Отговор до всички"</item>
     <item msgid="2758162027982270607">"Препращане"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"На <xliff:g id="DATE">%s</xliff:g> <xliff:g id="PERSON">%s</xliff:g>  написа:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"На <xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="PERSON">%2$s</xliff:g>  написа:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Препратено съобщение ----------&lt;br&gt;От: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Дата: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Тема: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;До: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Препратено съобщение ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Як: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> ново съобщение"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> нови съобщения"</item>

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 2e4e666..d50fa59 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"সকলকে উত্তর দিন"</item>
     <item msgid="2758162027982270607">"ফরোয়ার্ড"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> এ, <xliff:g id="PERSON">%s</xliff:g> লিখেছেন:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> এ, <xliff:g id="PERSON">%2$s</xliff:g> লিখেছেন:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- ফরোয়ার্ড করা বার্তা ----------&lt;br&gt;থেকে: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;তারিখ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;বিষয়: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;প্রাপক: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ফরোয়ার্ড করা বার্তা ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g>টি নতুন বার্তা"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g>টি নতুন বার্তা"</item>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fe93704..54ddf02 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Respon a tots"</item>
     <item msgid="2758162027982270607">"Reenvia"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"El dia <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> va escriure:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"El dia <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> va escriure:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Missatge reenviat ----------&lt;br&gt;De: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Assumpte: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Per a: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Missatge reenviat ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> missatge nou"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> missatges nous"</item>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 34a2b6f..b179782 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Odpovědět všem"</item>
     <item msgid="2758162027982270607">"Přeposlat"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Dne <xliff:g id="DATE">%s</xliff:g> <xliff:g id="PERSON">%s</xliff:g> napsal(a):"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Dne <xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="PERSON">%2$s</xliff:g> napsal(a):"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Přeposlaná zpráva ----------&lt;br&gt;Od: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Datum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Předmět: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Komu: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Přeposlaná zpráva ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Kopie: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nová zpráva"</item>
     <item quantity="other" msgid="3531683811183204615">"Nové zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 273a3b1..b2b71b4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Svar alle"</item>
     <item msgid="2758162027982270607">"Videresend"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Den <xliff:g id="DATE">%s</xliff:g> skrev <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Den <xliff:g id="DATE">%1$s</xliff:g> skrev <xliff:g id="PERSON">%2$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Videresendt meddelelse ----------&lt;br&gt;Fra: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Dato: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Emne: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Til: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Videresendt meddelelse ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> ny meddelelse"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> nye meddelelser"</item>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4916566..a5f15c4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Allen antworten"</item>
     <item msgid="2758162027982270607">"Weiterleiten"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Am <xliff:g id="DATE">%s</xliff:g> schrieb <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Am <xliff:g id="DATE">%1$s</xliff:g> schrieb <xliff:g id="PERSON">%2$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Weitergeleitete Nachricht ----------&lt;br&gt;Von: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Datum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Betreff: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;An: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Weitergeleitete Nachricht ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachricht"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten"</item>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4f6f928..cf57edd 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Απάντ. σε όλους"</item>
     <item msgid="2758162027982270607">"Προώθηση"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Στις <xliff:g id="DATE">%s</xliff:g>, ο χρήστης <xliff:g id="PERSON">%s</xliff:g> έγραψε:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Στις <xliff:g id="DATE">%1$s</xliff:g>, ο χρήστης <xliff:g id="PERSON">%2$s</xliff:g> έγραψε:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Προωθημένο μήνυμα ----------&lt;br&gt;Από: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Ημερομηνία: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Θέμα: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Προς: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Προωθημένο μήνυμα ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Κοιν.: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> νέο μήνυμα"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> νέα μηνύματα"</item>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 53212c5..edda34a 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Reply all"</item>
     <item msgid="2758162027982270607">"Forward"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> wrote:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> wrote:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Forwarded message ----------&lt;br&gt;From: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Date: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subject: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Forwarded message ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 53212c5..edda34a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Reply all"</item>
     <item msgid="2758162027982270607">"Forward"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> wrote:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> wrote:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Forwarded message ----------&lt;br&gt;From: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Date: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subject: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Forwarded message ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 53212c5..edda34a 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Reply all"</item>
     <item msgid="2758162027982270607">"Forward"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> wrote:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"On <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> wrote:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Forwarded message ----------&lt;br&gt;From: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Date: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subject: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Forwarded message ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8fbb9a4..cf76bb2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Responder a todos"</item>
     <item msgid="2758162027982270607">"Reenviar"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"El <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> escribió:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"El <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> escribió:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Mensaje reenviado ----------&lt;br&gt;De: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Fecha: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Asunto: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Para: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Mensaje reenviado ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje nuevo"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</item>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5dc8d0d..3f74107 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Responder a todos"</item>
     <item msgid="2758162027982270607">"Reenviar"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"El <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> escribió:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"El <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> escribió:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Mensaje reenviado ----------&lt;br&gt;De: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Fecha: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Asunto: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Para: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Mensaje reenviado ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g> &lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje nuevo"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</item>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index bf2ea26..564a199 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Vasta kõigile"</item>
     <item msgid="2758162027982270607">"Edasta"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%s</xliff:g> kirjutas kuupäeval <xliff:g id="DATE">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%2$s</xliff:g> kirjutas kuupäeval <xliff:g id="DATE">%1$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Edastatud sõnum ----------&lt;br&gt;Saatja: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Kuupäev: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Teema: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Saaja: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Edastatud kiri ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Koopia: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> uus sõnum"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> uut sõnumit"</item>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8253072..948ca61 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Erantzun guztiei"</item>
     <item msgid="2758162027982270607">"Birbidali"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%s</xliff:g> igorleak hau idatzi du (<xliff:g id="DATE">%s</xliff:g>):"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%2$s</xliff:g> igorleak hau idatzi du (<xliff:g id="DATE">%1$s</xliff:g>):"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Birbidalitako mezua ----------&lt;br&gt;Igorlea: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Gaia: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Hartzailea: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Birbidalitako mezua ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> mezu berri"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> mezu berri"</item>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1798726..7b7180b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"پاسخ به همه"</item>
     <item msgid="2758162027982270607">"باز ارسال"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"در تاریخ <xliff:g id="DATE">%s</xliff:g>، <xliff:g id="PERSON">%s</xliff:g> نوشت:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"در تاریخ <xliff:g id="DATE">%1$s</xliff:g>، <xliff:g id="PERSON">%2$s</xliff:g> نوشت:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"‏---------- پیام باز ارسال شده ----------&lt;br&gt;فرستنده: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Date: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;موضوع: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;گیرنده: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"------- پیام باز ارسال شده -------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</item>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 9bc07f3..2aadc56 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Vastaa kaikille"</item>
     <item msgid="2758162027982270607">"Lähetä edelleen"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%s</xliff:g> kirjoitti <xliff:g id="DATE">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%2$s</xliff:g> kirjoitti <xliff:g id="DATE">%1$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Edelleenlähetetty viesti ----------&lt;br&gt;Lähettäjä: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Päivämäärä: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Aihe: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Vastaanottaja: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Edelleenlähetetty viesti ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Kopio: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> uusi viesti"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> uutta viestiä"</item>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index d600f59..e800d3f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Répondre à tous"</item>
     <item msgid="2758162027982270607">"Transférer"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Le <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> a écrit :"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Le <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> a écrit :"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Forwarded message ---------- &lt;br&gt; De: <xliff:g id="FROM">%1$s</xliff:g> Date de fermeture: <xliff:g id="DATE">%2$s</xliff:g> réserve de droits: <xliff:g id="SUBJECT">%3$s</xliff:g> &lt;br&gt; Pour: <xliff:g id="TO">%4$s</xliff:g> &lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Message transféré ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc : <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g> : <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g> : <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nouveau message"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</item>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5fc8ccd..26b57f1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Répondre à tous"</item>
     <item msgid="2758162027982270607">"Transférer"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Le <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> a écrit :"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Le <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> a écrit :"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Message transféré ----------&lt;br&gt;De : <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Date : <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Objet : <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;À : <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Message transféré ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc : <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g> : <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g> : <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nouveau message"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</item>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index b5ec3ed..67a519c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Responder a todos"</item>
     <item msgid="2758162027982270607">"Reenviar"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"O <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> escribiu:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"O <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> escribiu:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Mensaxe reenviada ----------&lt;br&gt;De: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Asunto: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Para: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Mensaxe reenviada ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> mensaxe nova"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> mensaxes novas"</item>

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index fa5a2cc..0d94a98 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"બધાને જવાબ આપો"</item>
     <item msgid="2758162027982270607">"ફોરવર્ડ કરો"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> ના રોજ, <xliff:g id="PERSON">%s</xliff:g> એ લખ્યું:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> ના રોજ, <xliff:g id="PERSON">%2$s</xliff:g> એ લખ્યું:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- ફોરવર્ડ કરેલો સંદેશ ----------&lt;br&gt;પ્રેષક: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;તારીખ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;વિષય: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;પ્રતિ: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ફોરવર્ડ કરેલ સંદેશ ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> નવો સંદેશ"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> નવા સંદેશા"</item>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 333adae..9ab21f7 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"सभी प्रषकों को उत्तर दें"</item>
     <item msgid="2758162027982270607">"आगे भेजें"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> को, <xliff:g id="PERSON">%s</xliff:g> ने लिखा:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> को, <xliff:g id="PERSON">%2$s</xliff:g> ने लिखा:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- अग्रेषित संदेश ----------&lt;br&gt;प्रेषक: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;दिनांक: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;विषय: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;प्रति: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- अग्रेषित संदेश ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> नया संदेश"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश"</item>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d95a959..68ce521 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Odgovori svima"</item>
     <item msgid="2758162027982270607">"Proslijedi"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Dana <xliff:g id="DATE">%s</xliff:g> osoba <xliff:g id="PERSON">%s</xliff:g> napisala je:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Dana <xliff:g id="DATE">%1$s</xliff:g> osoba <xliff:g id="PERSON">%2$s</xliff:g> napisala je:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Proslijeđena poruka ----------&lt;br&gt;Šalje: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Datum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Predmet: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Prima: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Proslijeđena poruka ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Kopija: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nova poruka"</item>
     <item quantity="other" msgid="3531683811183204615">"Novih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7987164..e65c91b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Válasz mindnek"</item>
     <item msgid="2758162027982270607">"Továbbítás"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> ezt írta (<xliff:g id="PERSON">%s</xliff:g>):"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> ezt írta (<xliff:g id="PERSON">%2$s</xliff:g>):"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Továbbított üzenet ----------&lt;br&gt;Feladó: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Dátum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Tárgy: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Címzett: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Továbbított üzenet ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Másolatot kap: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</item>

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 9fcd843..726e3f7 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Պատասխանել բոլորին"</item>
     <item msgid="2758162027982270607">"Փոխանցել"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>-ին, <xliff:g id="PERSON">%s</xliff:g>-ը գրել է`"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>-ին, <xliff:g id="PERSON">%2$s</xliff:g>-ը գրել է`"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Փոխանցված հաղորդագրություն ----------&lt;br&gt;Ումից` <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Ամսաթիվը` <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Վերնագիրը` <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Ում` <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Փոխանցված հաղորդագրություն ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Պճ` <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> նոր հաղորդագրություն"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> նոր հաղորդագրություն"</item>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9fd70ba..164d0bc 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Balas semua"</item>
     <item msgid="2758162027982270607">"Teruskan"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> menulis:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> menulis:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Pesan Terusan----------&lt;br&gt; Dari: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Tanggal: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subjek: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Kepada: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Pesan yang diteruskan ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</item>

diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 4b2d045..c4fb3e6 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Svara öllum"</item>
     <item msgid="2758162027982270607">"Áframsenda"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> skrifaði <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> skrifaði <xliff:g id="PERSON">%2$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Áframsent skeyti ----------&lt;br&gt;Frá: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Dagsetning: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Efni: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Til: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Áframsent skeyti ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Afrit: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nýtt skeyti"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> ný skeyti"</item>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 325fe14..0d306cf 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Rispondi a tutti"</item>
     <item msgid="2758162027982270607">"Inoltra"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Il <xliff:g id="DATE">%s</xliff:g> <xliff:g id="PERSON">%s</xliff:g> ha scritto:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Il <xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="PERSON">%2$s</xliff:g> ha scritto:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Messaggio inoltrato ----------&lt;br&gt;Da: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Oggetto: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;A: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Messaggio inoltrato ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nuovo messaggio"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi"</item>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9fc4c29..787528f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"השב לכולם"</item>
     <item msgid="2758162027982270607">"העבר"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"בתאריך <xliff:g id="DATE">%s</xliff:g>, ‏<xliff:g id="PERSON">%s</xliff:g> כתב:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"בתאריך <xliff:g id="DATE">%1$s</xliff:g>, ‏<xliff:g id="PERSON">%2$s</xliff:g> כתב:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"‏---------- הודעה שהועברה ----------&lt;br&gt;מאת: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;תאריך: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;נושא: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;אל: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- הודעה שהועברה ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"‏עותק: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>:‏ <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>:‏ <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"הודעה חדשה <xliff:g id="COUNT">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות"</item>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 020d446..1e617c8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"全員に返信"</item>
     <item msgid="2758162027982270607">"転送"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="PERSON">%2$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- 転送メッセージ ----------&lt;br&gt;From: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;日付: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;件名: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"----------転送メッセージ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"新着メール<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
     <item quantity="other" msgid="3531683811183204615">"新着メール<xliff:g id="COUNT">%1$d</xliff:g>件"</item>

diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 0686e69..033d750 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"პასუხი ყველას"</item>
     <item msgid="2758162027982270607">"გადაგზავნა"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> დაწერა:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> დაწერა:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- გადაგზავნილი შეტყობინება ----------&lt;br&gt;გამგზავნი: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;თარიღი: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;თემა: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;მიმღები: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- გადაგზავნილი შეტყობინება ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"ასლი: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> ახალი შეტყობინება"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> ახალი შეტყობინება"</item>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 22c4f0b..3b87b16 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -37,7 +37,7 @@
     <item msgid="2767793214788399009">"Барл. жау. беру"</item>
     <item msgid="2758162027982270607">"Қайта жіберу"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> күні <xliff:g id="PERSON">%s</xliff:g> жазды:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> күні <xliff:g id="PERSON">%2$s</xliff:g> жазды:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Қайта жіберілген хабар ----------&lt;br&gt;Кімнен: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Күні: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Тақырыбы: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Кімге: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Қайта жіберілген хабар ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Көшірме: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -337,7 +337,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> жаңа хабар"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> жаңа хабар"</item>

diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index fe0f3a3..aca8a98 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"ឆ្លើយតបទាំងអស់"</item>
     <item msgid="2758162027982270607">"បញ្ជូនបន្ត"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"នៅ <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> បានសរសេរ៖"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"នៅ <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> បានសរសេរ៖"</string>
     <string name="forward_attribution" msgid="597850048345475752">"----------សារបានបញ្ជូនបន្ត ----------&lt;br&gt;ពី៖ <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;កាលបរិច្ឆេទ៖ <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;ប្រធានបទ៖ <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;ជូនចំពោះ៖ <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- សារបានបញ្ជូនបន្ត ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"ចម្លងជូន៖ <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>៖ <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>៖ <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"សារថ្មី <xliff:g id="COUNT">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="3531683811183204615">"សារថ្មី <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 88b5535..11edca5 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"ಎಲ್ಲರಿಗೂ ಪ್ರತ್ಯುತ್ತರಿಸು"</item>
     <item msgid="2758162027982270607">"ಫಾರ್ವರ್ಡ್"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> ರಂದು, <xliff:g id="PERSON">%s</xliff:g> ಅವರು ಬರೆದರು:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> ರಂದು, <xliff:g id="PERSON">%2$s</xliff:g> ಅವರು ಬರೆದರು:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- ಫಾರ್ವರ್ಡ್ ಮಾಡಲಾದ ಸಂದೇಶ ----------&lt;br&gt;ಇಂದ: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;ದಿನಾಂಕ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;ವಿಷಯ: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;ಗೆ: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ಫಾರ್ವರ್ಡ್ ಮಾಡಲಾದ ಸಂದೇಶ ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> ಹೊಸ ಸಂದೇಶ"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> ಹೊಸ ಸಂದೇಶಗಳು"</item>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index db713d3..9650a0b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"전체답장"</item>
     <item msgid="2758162027982270607">"전달"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>에 <xliff:g id="PERSON">%s</xliff:g>님이 작성:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>에 <xliff:g id="PERSON">%2$s</xliff:g>님이 작성:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- 전달된 메일 ----------&lt;br&gt;보낸사람: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;날짜: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;제목: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;받는사람: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- 전달된 메일 ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"참조: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"새 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
     <item quantity="other" msgid="3531683811183204615">"새 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 00b030a..dce765c 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -37,7 +37,7 @@
     <item msgid="2767793214788399009">"Баары жооп бер"</item>
     <item msgid="2758162027982270607">"Багыттоо"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> күнү, <xliff:g id="PERSON">%s</xliff:g> жазган:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> күнү, <xliff:g id="PERSON">%2$s</xliff:g> жазган:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Багытталган билдирүү ----------&lt;br&gt;Кимден: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Күнү: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Тема: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Багытталган билдирүү ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Көчүрмө: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -337,7 +337,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> жаңы билдирүү"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> жаңы билдирүү"</item>

diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index aac69c6..169c78a 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"ຕອບກັບທັງຫມົດ"</item>
     <item msgid="2758162027982270607">"ສົ່ງຕໍ່"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"ເມື່ອ <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> ຂຽນວ່າ:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"ເມື່ອ <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> ຂຽນວ່າ:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- ຂໍ້ຄວາມສົ່ງຕໍ່ ---------- &lt;br&gt; ຈາກ: <xliff:g id="FROM">%1$s</xliff:g> ວັນທີ &lt;br&gt;: <xliff:g id="DATE">%2$s</xliff:g> ຫົວຂໍ້ &lt;br&gt;: <xliff:g id="SUBJECT">%3$s</xliff:g> &lt;br&gt; ເຖິງ: <xliff:g id="TO">%4$s</xliff:g> &lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ຂໍ້ຄວາມທີ່ສົ່ງຕໍ່ ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມໃໝ່"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> ອີເມວໃໝ່"</item>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3b6625e..eb945c6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Atsakyt visiems"</item>
     <item msgid="2758162027982270607">"Pirmyn"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> <xliff:g id="PERSON">%s</xliff:g> rašė:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="PERSON">%2$s</xliff:g> rašė:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Persiųstas pranešimas ----------&lt;br&gt;Nuo: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Tema: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Kam: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Persiųstas pranešimas ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="3531683811183204615">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 15295da..5c5fbe1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Atbildēt visiem"</item>
     <item msgid="2758162027982270607">"Pārsūtīt"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> rakstīja:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> rakstīja:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Pārsūtīts ziņojums ----------&lt;br&gt;No: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Datums: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Temats: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Kam: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Pārsūtīts ziņojums ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Kopija: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> jauns ziņojums"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> jauni ziņojumi"</item>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4c0c8b4..bb4b425 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -37,7 +37,7 @@
     <item msgid="2767793214788399009">"Одговори на сите"</item>
     <item msgid="2758162027982270607">"Проследи"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"На <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> напиша:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"На <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> напиша:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Проследена порака ----------&lt;br&gt;Од: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Датум: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Предмет: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;До: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Проследена порака ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Цц: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -337,7 +337,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> нова порака"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> нови пораки"</item>

diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 5d9eec7..002334d 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"എല്ലാവർക്കും മറുപടി നൽകുക"</item>
     <item msgid="2758162027982270607">"കൈമാറുക"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>-ന് <xliff:g id="PERSON">%s</xliff:g> എഴുതി:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>-ന് <xliff:g id="PERSON">%2$s</xliff:g> എഴുതി:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- കൈമാറിയ സന്ദേശം ----------&lt;br&gt;അയച്ചയാൾ: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;തീയതി: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;വിഷയം: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;സ്വീകർത്താവ്: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- കൈമാറിയ സന്ദേശം ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> പുതിയ സന്ദേശം"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> പുതിയ സന്ദേശങ്ങൾ"</item>

diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index fd93134..9d3b243 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Бүгдэд хариу илгээх"</item>
     <item msgid="2758162027982270607">"Дамжуулах"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>-д, <xliff:g id="PERSON">%s</xliff:g> бичсэн:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>-д, <xliff:g id="PERSON">%2$s</xliff:g> бичсэн:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Дамжуулсан зурвас ----------&lt;br&gt;Хэнээс: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Огноо: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Гарчиг: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Хэнд: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Дамжуулагдсан мессеж ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> шинэ зурвас"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> шинэ зурвас"</item>

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0a76d98..2e1ed84 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"सर्वांना प्रत्युत्तर द्या"</item>
     <item msgid="2758162027982270607">"अग्रेषित करा"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> रोजी, <xliff:g id="PERSON">%s</xliff:g> ने लिहिले:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> रोजी, <xliff:g id="PERSON">%2$s</xliff:g> ने लिहिले:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- अग्रेषित संदेश ----------&lt;br&gt;प्रेषक: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;तारीख: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;विषय: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;प्रति: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- अग्रेषित संदेश ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> नवीन संदेश"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> नवीन संदेश"</item>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index be3a5de..0be668c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Balas kepada semua"</item>
     <item msgid="2758162027982270607">"Kirim semula"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Pada <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> menulis:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Pada <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> menulis:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Mesej kiriman semula ----------&lt;br&gt;Daripada: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Tarikh: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subjek: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Kepada: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Mesej yang dikirim semula ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Sk: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu"</item>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index aa1154a..fe0b2e8 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"အားလုံးကို ဖြေ"</item>
     <item msgid="2758162027982270607">"တစ်ဆင့်ပို့"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>တွင် <xliff:g id="PERSON">%s</xliff:g> ရေးခဲ့:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>တွင် <xliff:g id="PERSON">%2$s</xliff:g> ရေးခဲ့:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- တစ်ဆင့်ပို့လိုက်သည့် စာ----------&lt;br&gt;မှ - <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;ရက်စွဲ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;အကြောင်းအရာ: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;သို့: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"တစ်ဆင့်ပို့လိုက်သည့် စာ"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"စာ အသစ် <xliff:g id="COUNT">%1$d</xliff:g> ခု"</item>
     <item quantity="other" msgid="3531683811183204615">"စာ အသစ် <xliff:g id="COUNT">%1$d</xliff:g> ခု"</item>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 94c53d4..73390d6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Svar alle"</item>
     <item msgid="2758162027982270607">"Videresend"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> skrev <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> skrev <xliff:g id="PERSON">%2$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Videresendt e-post ----------&lt;br&gt;Fra: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Dato: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Emne: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Til: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Videresendt e-post ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Kopi: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> ny e-post"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> nye e-poster"</item>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index e5e0802..b5d40b0 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"सबैलाई जवाफ दिनुहोस्"</item>
     <item msgid="2758162027982270607">"अग्रप्रेषण गर्नुहोस्"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>मा <xliff:g id="PERSON">%s</xliff:g>ले लेख्नुभयो:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>मा <xliff:g id="PERSON">%2$s</xliff:g>ले लेख्नुभयो:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- फर्वाड गरिएका सन्देश ----------&lt;br&gt;प्रेषक: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;मिति: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;विषय: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;प्रापक: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- अग्रेषित गरिएको सन्देश ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> नयाँ सन्देश"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> नयाँ सन्देशहरू"</item>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 322b512..6165287 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Allen beantwoorden"</item>
     <item msgid="2758162027982270607">"Doorsturen"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Op <xliff:g id="DATE">%s</xliff:g> schreef <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Op <xliff:g id="DATE">%1$s</xliff:g> schreef <xliff:g id="PERSON">%2$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Doorgestuurd bericht ----------&lt;br&gt;Van: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Datum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Onderwerp: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Aan: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Doorgestuurd bericht ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nieuw bericht"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten"</item>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1a0d871..50f4fc0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Odpowiedz wszystkim"</item>
     <item msgid="2758162027982270607">"Przekaż dalej"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> <xliff:g id="PERSON">%s</xliff:g>  napisał(a):"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="PERSON">%2$s</xliff:g>  napisał(a):"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Wiadomość przekazana -----------&lt;br&gt;Od: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Temat: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Do: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Wiadomość przekazana dalej ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"DW: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nowa wiadomość"</item>
     <item quantity="other" msgid="3531683811183204615">"Nowe wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2f7e29c..4396076 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Responder a todos"</item>
     <item msgid="2758162027982270607">"Encaminhar"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Em <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> escreveu:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Em <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> escreveu:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Mensagem encaminhada ----------&lt;br&gt;De: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Assunto: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Para: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Mensagem encaminhada ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem nova"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens novas"</item>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3f1dd62..cbce54b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Resp. a todos"</item>
     <item msgid="2758162027982270607">"Encaminhar"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Em <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> escreveu:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Em <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> escreveu:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Mensagem encaminhada ----------&lt;br&gt;De: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Assunto: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Para: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Mensagem encaminhada ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nova mensagem"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> novas mensagens"</item>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index cc291ab..0a826a5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Răsp. tuturor"</item>
     <item msgid="2758162027982270607">"Redirecţionaţi"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Pe <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> a scris:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Pe <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> a scris:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Mesaj redirecţionat ----------&lt;br&gt;De la: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Dată: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subiect: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Către: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Mesaj redirecționat ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> mesaj nou"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje noi"</item>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index be49b4e..207fce5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Ответить всем"</item>
     <item msgid="2758162027982270607">"Переслать"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> пользователь <xliff:g id="PERSON">%s</xliff:g> написал:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> пользователь <xliff:g id="PERSON">%2$s</xliff:g> написал:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Переадресованное сообщение ----------&lt;br&gt;От: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Дата: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Тема: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Кому: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Пересылаемое сообщение ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Копия: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"Новых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="3531683811183204615">"Новых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 6ffbf96..c64408e 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"සියල්ලන්ටම පිළිතුරු යවන්න"</item>
     <item msgid="2758162027982270607">"ඉදිරියට"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> දින, <xliff:g id="PERSON">%s</xliff:g> ලියන ලදි:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> දින, <xliff:g id="PERSON">%2$s</xliff:g> ලියන ලදි:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- ඉදිරියට යවන ලද පණිවිඩය ----------&lt;br&gt;වෙතින්: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;දිනය: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;කාරණය: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;වෙත: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ඉදිරියට යැවූ පණිවිඩය ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"කා.පි: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"අලුත් පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="3531683811183204615">"අලුත් පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4004c2f..160d735 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Odp. všetkým"</item>
     <item msgid="2758162027982270607">"Poslať ďalej"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Dňa <xliff:g id="DATE">%s</xliff:g> používateľ <xliff:g id="PERSON">%s</xliff:g> napísal:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Dňa <xliff:g id="DATE">%1$s</xliff:g> používateľ <xliff:g id="PERSON">%2$s</xliff:g> napísal:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Správa poslaná ďalej ---------&lt;br&gt;Od: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Dátum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Predmet: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Komu: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Správa poslaná ďalej ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Kópia: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nová správa"</item>
     <item quantity="other" msgid="3531683811183204615">"Počet nových správ: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a15dafe..dffdaca 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Odgovori vsem"</item>
     <item msgid="2758162027982270607">"Posreduj"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Dne <xliff:g id="DATE">%s</xliff:g> je oseba <xliff:g id="PERSON">%s</xliff:g> napisala:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Dne <xliff:g id="DATE">%1$s</xliff:g> je oseba <xliff:g id="PERSON">%2$s</xliff:g> napisala:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Posredovano sporočilo ----------&lt;br&gt;Od: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Datum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Zadeva: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Za: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"-------------- Posredovano sporočilo --------------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Kp: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> novo sporočilo"</item>
     <item quantity="other" msgid="3531683811183204615">"Št. novih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 76b326b..bff9357 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Одговори свима"</item>
     <item msgid="2758162027982270607">"Проследи"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> је написао/ла:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> је написао/ла:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Прослеђена порука ----------&lt;br&gt;Од: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Датум: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Наслов: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Коме: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Прослеђена порука ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Копија: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> нова порука"</item>
     <item quantity="other" msgid="3531683811183204615">"Нових порука: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4fb869f..7169248 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Svara alla"</item>
     <item msgid="2758162027982270607">"Vidarebefordra"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Den <xliff:g id="DATE">%s</xliff:g> skrev <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Den <xliff:g id="DATE">%1$s</xliff:g> skrev <xliff:g id="PERSON">%2$s</xliff:g>:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Vidarebefordrat meddelande ----------&lt;br&gt;Från: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Datum: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Ämne: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Till: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Vidarebefordrat meddelande ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Kopia: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> nytt meddelande"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden"</item>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3b7644a..4b48fed 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Jibu wote"</item>
     <item msgid="2758162027982270607">"Sambaza"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Mnamo <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> aliandika:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Mnamo <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> aliandika:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Ujumbe uliosambazwa ----------&lt;br&gt;Kutoka: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Tarehe: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Kichwa: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Kwa: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Ujumbe uliosambazwa----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Nakala kwa: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"Barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
     <item quantity="other" msgid="3531683811183204615">"Barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 697f5d7..1b755a2 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"எல்லோருக்கும் பதிலளி"</item>
     <item msgid="2758162027982270607">"முன்னனுப்பு"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> அன்று, <xliff:g id="PERSON">%s</xliff:g> எழுதியது:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> அன்று, <xliff:g id="PERSON">%2$s</xliff:g> எழுதியது:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- முன்னனுப்பப்பட்ட செய்தி ----------&lt;br&gt;அனுப்புநர்: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;தேதி: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;தலைப்பு: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;பெறுநர்: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- முன்னனுப்பப்பட்ட செய்தி ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> புதிய செய்தி"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> புதிய செய்திகள்"</item>

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 855fd1d..2366801 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"అందరికీ ప్రత్యు."</item>
     <item msgid="2758162027982270607">"ఫార్వార్డ్ చేయి"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>న, <xliff:g id="PERSON">%s</xliff:g> వ్రాసినది:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>న, <xliff:g id="PERSON">%2$s</xliff:g> వ్రాసినది:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- ఫార్వార్డ్ చేసిన సందేశం ----------&lt;br&gt;వీరి నుండి: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;తేదీ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;విషయం: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;వీరికి: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ఫార్వార్డ్ చేసిన సందేశం ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> కొత్త సందేశం"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> కొత్త సందేశాలు"</item>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2cc5d28..fc40947 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"ตอบทุกคน"</item>
     <item msgid="2758162027982270607">"ส่งต่อ"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"เมื่อ <xliff:g id="DATE">%s</xliff:g> <xliff:g id="PERSON">%s</xliff:g> เขียนว่า:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"เมื่อ <xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="PERSON">%2$s</xliff:g> เขียนว่า:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- จดหมายที่ส่งต่อ ----------&lt;br&gt;จาก: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;วันที่: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;หัวเรื่อง: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;ถึง: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- ข้อความที่ส่งต่อ ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"สำเนา: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</item>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 008434b..0f1682b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Tumugon sa lahat"</item>
     <item msgid="2758162027982270607">"Ipasa"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Noong <xliff:g id="DATE">%s</xliff:g>, isinulat ni <xliff:g id="PERSON">%s</xliff:g> ang:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Noong <xliff:g id="DATE">%1$s</xliff:g>, isinulat ni <xliff:g id="PERSON">%2$s</xliff:g> ang:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Ipinasang mensahe ----------&lt;br&gt;Mula kay: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Petsa: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Paksa: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Para kay: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Ipinasang mensahe ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> bagong mensahe"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> (na) bagong mensahe"</item>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d207b0e..32cba88 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Tümünü yanıtla"</item>
     <item msgid="2758162027982270607">"Yönlendir"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> tarihinde <xliff:g id="PERSON">%s</xliff:g> yazdı:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> tarihinde <xliff:g id="PERSON">%2$s</xliff:g> yazdı:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Yönlendirilen ileti ----------&lt;br&gt;Gönderen: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Tarih:<xliff:g id="DATE">%2$s</xliff:g> &lt;br&gt;Konu: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Alıcı: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Yönlendirilen ileti ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti"</item>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6583d24..931566d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Відповісти всім"</item>
     <item msgid="2758162027982270607">"Переслати"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>, користувач <xliff:g id="PERSON">%s</xliff:g> написав:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>, користувач <xliff:g id="PERSON">%2$s</xliff:g> написав:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Переслане повідомлення ----------&lt;br&gt;Від: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Дата: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Тема: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Кому: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Переадресоване повідомлення ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Копія: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> нове повідомлення"</item>
     <item quantity="other" msgid="3531683811183204615">"Нових повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</item>

diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 370c636..d0d40a8 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"سب کو جواب دیں"</item>
     <item msgid="2758162027982270607">"فارورڈ کریں"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g> کو <xliff:g id="PERSON">%s</xliff:g> نے لکھا:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g> کو <xliff:g id="PERSON">%2$s</xliff:g> نے لکھا:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"‏---------- فارورڈ کیا ہوا پیغام ----------&lt;br&gt;منجانب: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;تاریخ: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;موضوع: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;بنام: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- فارورڈ کیا ہوا پیغام ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"‏سی سی: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> نیا پیغام"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> نئے پیغامات"</item>

diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index f0eaa8c..358745d 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -37,7 +37,7 @@
     <item msgid="2767793214788399009">"Barchasiga"</item>
     <item msgid="2758162027982270607">"Yo‘naltirish"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> yozdi:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> yozdi:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Qayta yo‘naltirilgan xabar ----------&lt;br&gt;Kimdan: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Sana: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Mavzu: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Kimga: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Qayta yo‘naltirilgan xabar ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -337,7 +337,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> ta yangi xabar"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> ta yangi xabar"</item>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index aed1918..b75e1d5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Trả lời tất cả"</item>
     <item msgid="2758162027982270607">"Chuyển tiếp"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Vào <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> đã viết:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Vào <xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="PERSON">%2$s</xliff:g> đã viết:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Tin nhắn đã chuyển tiếp ----------&lt;br&gt;Từ: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Ngày: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Chủ đề: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Tới: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Thư đã chuyển tiếp ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>: <xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn mới"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn mới"</item>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8937b6f..d36e840 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"全部回复"</item>
     <item msgid="2758162027982270607">"转发"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%s</xliff:g>于 <xliff:g id="DATE">%s</xliff:g>写道："</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%2$s</xliff:g>于 <xliff:g id="DATE">%1$s</xliff:g>写道："</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- 转发的邮件 ----------&lt;br&gt;发件人：<xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;日期：<xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;主题：<xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;收件人：<xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- 转发的邮件 ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"抄送：<xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>：<xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>：<xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"有<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</item>
     <item quantity="other" msgid="3531683811183204615">"有<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</item>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 0c814f1..4f41028 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"全部回覆"</item>
     <item msgid="2758162027982270607">"轉寄"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"於 <xliff:g id="DATE">%s</xliff:g>，<xliff:g id="PERSON">%s</xliff:g> 寫道："</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"於 <xliff:g id="DATE">%1$s</xliff:g>，<xliff:g id="PERSON">%2$s</xliff:g> 寫道："</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- 轉寄的郵件 ----------&lt;br&gt;寄件者：<xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;日期：<xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;主旨：<xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;收件者：<xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- 轉寄郵件 ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"副本：<xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>：<xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>：<xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> 則新訊息"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> 則新訊息"</item>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e785bec..53f9ba8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"回覆所有人"</item>
     <item msgid="2758162027982270607">"轉寄"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%s</xliff:g> 於 <xliff:g id="DATE">%s</xliff:g> 寫道："</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"<xliff:g id="PERSON">%2$s</xliff:g> 於 <xliff:g id="DATE">%1$s</xliff:g> 寫道："</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- 轉寄的郵件 ----------&lt;br&gt;寄件者：<xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;日期：<xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;主旨：<xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;收件者：<xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- 轉寄郵件 ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"副本：<xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g>：<xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g>：<xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</item>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e26cb9b..8784dec 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -35,7 +35,7 @@
     <item msgid="2767793214788399009">"Phendula konke"</item>
     <item msgid="2758162027982270607">"Dlulisela"</item>
   </string-array>
-    <string name="reply_attribution" msgid="1114972798797833259">"Ngomhlaka <xliff:g id="DATE">%s</xliff:g>, u-<xliff:g id="PERSON">%s</xliff:g> ubhale:"</string>
+    <string name="reply_attribution" msgid="1114972798797833259">"Ngomhlaka <xliff:g id="DATE">%1$s</xliff:g>, u-<xliff:g id="PERSON">%2$s</xliff:g> ubhale:"</string>
     <string name="forward_attribution" msgid="597850048345475752">"---------- Umyalezo odlulisiwe ----------&lt;br&gt;Kusuka: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Usuku: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Isihloko: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Ku: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="1828826576779486239">"---------- Umlayezo odluliselwe ----------"</string>
     <string name="cc_attribution" msgid="2928584226469388899">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
@@ -349,7 +349,7 @@
     <string name="veiled_alternate_text" msgid="6343564357099807582"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="6728323554307952217"></string>
     <string name="veiled_summary_unknown_person" msgid="2122359944161241551"></string>
-    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%s</xliff:g><xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
+    <string name="label_notification_ticker" msgid="323232821061341014">"<xliff:g id="LABEL">%1$s</xliff:g><xliff:g id="NOTIFICATION">%2$s</xliff:g>"</string>
   <plurals name="new_messages">
     <item quantity="one" msgid="3446656407520493241">"<xliff:g id="COUNT">%1$d</xliff:g> umlayezo omusha"</item>
     <item quantity="other" msgid="3531683811183204615">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emisha"</item>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 608acdb..951f107 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -70,7 +70,7 @@
     <!-- Compose screen, Prefix to forwarded message subject. Do not translate. -->
     <string name="forward_subject_label" translatable="false">Fwd:</string>
     <!-- Compose screen, displayed at the top of a message being replied to. Please preserve the HTML entities (surrounded by & and ;).  The two %s strings will be replaced by 1) the date 2) the person who wrote the email being responded to. [CHAR LIMIT=1000]-->
-    <string name="reply_attribution">On <xliff:g id="date">%s</xliff:g>, <xliff:g id="person">%s</xliff:g> wrote:</string>
+    <string name="reply_attribution">On <xliff:g id="date">%1$s</xliff:g>, <xliff:g id="person">%2$s</xliff:g> wrote:</string>
     <!-- Compose screen, displayed at the top of a message being forwarded. Please preserve the HTML entities (surrounded by & and ;). [CHAR LIMIT=1000] -->
     <string name="forward_attribution">---------- Forwarded message ----------&lt;br&gt;From: <xliff:g id="from">%1$s</xliff:g>&lt;br&gt;Date: <xliff:g id="date">%2$s</xliff:g>&lt;br&gt;Subject: <xliff:g id="subject">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="to">%4$s</xliff:g>&lt;br&gt;</string>
     <!-- Compose screen, displayed at the top of a message being forwarded. [CHAR LIMIT=100]-->
@@ -789,7 +789,7 @@
     <string name="veiled_summary_unknown_person"/>
 
     <!-- Notification ticker text for per-label notification [CHAR LIMIT=30]-->
-    <string name="label_notification_ticker">"<xliff:g id="label">%s</xliff:g>: <xliff:g id="notification">%s</xliff:g>"</string>
+    <string name="label_notification_ticker">"<xliff:g id="label">%1$s</xliff:g>: <xliff:g id="notification">%2$s</xliff:g>"</string>
 
     <!-- Notification message to the user upon new messages for a conversation. [CHAR LIMIT=120] -->
     <plurals name="new_messages">

diff --git a/src/com/android/mail/MailIntentService.java b/src/com/android/mail/MailIntentService.java
index 8151dfc..db7b99b 100644
--- a/src/com/android/mail/MailIntentService.java
+++ b/src/com/android/mail/MailIntentService.java

@@ -15,11 +15,12 @@
  */
 package com.android.mail;
 
-import android.app.IntentService;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
+import androidx.core.app.JobIntentService;
+
 import com.android.mail.analytics.Analytics;
 import com.android.mail.photo.ContactFetcher;
 import com.android.mail.providers.Account;
@@ -34,7 +35,7 @@
 /**
  * A service to handle various intents asynchronously.
  */
-public class MailIntentService extends IntentService {
+public class MailIntentService extends JobIntentService {
     private static final String LOG_TAG = LogTag.getLogTag();
 
     public static final String ACTION_RESEND_NOTIFICATIONS =
@@ -56,16 +57,18 @@
 
     public static final String CONVERSATION_EXTRA = "conversation";
 
+    public static final int JOB_ID = 100;
+
     public MailIntentService() {
-        super("MailIntentService");
+        super();
     }
 
-    protected MailIntentService(final String name) {
-        super(name);
+    public static void enqueueWork(Context context, Intent work) {
+        enqueueWork(context, MailIntentService.class, JOB_ID, work);
     }
 
     @Override
-    protected void onHandleIntent(final Intent intent) {
+    protected void onHandleWork(final Intent intent) {
         // UnifiedEmail does not handle all Intents
 
         LogUtils.v(LOG_TAG, "Handling intent %s", intent);

diff --git a/src/com/android/mail/NotificationActionIntentService.java b/src/com/android/mail/NotificationActionIntentService.java
index bd9c856..16a5f94 100644
--- a/src/com/android/mail/NotificationActionIntentService.java
+++ b/src/com/android/mail/NotificationActionIntentService.java

@@ -22,7 +22,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Parcel;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.android.mail.analytics.Analytics;
 import com.android.mail.providers.Message;

diff --git a/src/com/android/mail/browse/ConversationContainer.java b/src/com/android/mail/browse/ConversationContainer.java
index 01e6fbc..b575ede 100644
--- a/src/com/android/mail/browse/ConversationContainer.java
+++ b/src/com/android/mail/browse/ConversationContainer.java

@@ -21,7 +21,7 @@
 import android.content.res.Configuration;
 import android.database.DataSetObserver;
 import android.graphics.Rect;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.Gravity;

diff --git a/src/com/android/mail/browse/ConversationCursor.java b/src/com/android/mail/browse/ConversationCursor.java
index dde641f..595b64d 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java

@@ -35,7 +35,7 @@
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.SystemClock;
-import android.support.v4.util.SparseArrayCompat;
+import androidx.collection.SparseArrayCompat;
 import android.text.TextUtils;
 
 import com.android.mail.content.ThreadSafeCursorWrapper;

diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index e2dcf47..d3aa3a2 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java

@@ -34,10 +34,10 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
-import android.support.annotation.Nullable;
-import android.support.v4.text.BidiFormatter;
-import android.support.v4.text.TextUtilsCompat;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.Nullable;
+import androidx.core.text.BidiFormatter;
+import androidx.core.text.TextUtilsCompat;
+import androidx.core.view.ViewCompat;
 import android.text.Layout.Alignment;
 import android.text.Spannable;
 import android.text.SpannableString;

diff --git a/src/com/android/mail/browse/ConversationItemViewCoordinates.java b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
index b6a1029..f2b5601 100644
--- a/src/com/android/mail/browse/ConversationItemViewCoordinates.java
+++ b/src/com/android/mail/browse/ConversationItemViewCoordinates.java

@@ -22,7 +22,7 @@
 import android.content.res.Resources;
 import android.graphics.Paint.FontMetricsInt;
 import android.graphics.Typeface;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/src/com/android/mail/browse/ConversationPager.java b/src/com/android/mail/browse/ConversationPager.java
index a877e32..9af0d0c 100644
--- a/src/com/android/mail/browse/ConversationPager.java
+++ b/src/com/android/mail/browse/ConversationPager.java

@@ -18,7 +18,7 @@
 package com.android.mail.browse;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 
 public class ConversationPager extends ViewPager {

diff --git a/src/com/android/mail/browse/ConversationPagerAdapter.java b/src/com/android/mail/browse/ConversationPagerAdapter.java
index 6282ff4..c1c7ff4 100644
--- a/src/com/android/mail/browse/ConversationPagerAdapter.java
+++ b/src/com/android/mail/browse/ConversationPagerAdapter.java

@@ -25,7 +25,7 @@
 import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.ViewGroup;
 
 import com.android.mail.preferences.MailPrefs;

diff --git a/src/com/android/mail/browse/ConversationPagerController.java b/src/com/android/mail/browse/ConversationPagerController.java
index 0daee9b..1783a56 100644
--- a/src/com/android/mail/browse/ConversationPagerController.java
+++ b/src/com/android/mail/browse/ConversationPagerController.java

@@ -24,7 +24,7 @@
 import android.database.DataSetObservable;
 import android.database.DataSetObserver;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
 

diff --git a/src/com/android/mail/browse/ConversationViewAdapter.java b/src/com/android/mail/browse/ConversationViewAdapter.java
index 8545ee4..b4a8139 100644
--- a/src/com/android/mail/browse/ConversationViewAdapter.java
+++ b/src/com/android/mail/browse/ConversationViewAdapter.java

@@ -20,8 +20,8 @@
 import android.app.FragmentManager;
 import android.app.LoaderManager;
 import android.content.Context;
-import android.support.annotation.IntDef;
-import android.support.v4.text.BidiFormatter;
+import androidx.annotation.IntDef;
+import androidx.core.text.BidiFormatter;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/src/com/android/mail/browse/EmlMessageLoader.java b/src/com/android/mail/browse/EmlMessageLoader.java
index 82fa98f..acf7716 100644
--- a/src/com/android/mail/browse/EmlMessageLoader.java
+++ b/src/com/android/mail/browse/EmlMessageLoader.java

@@ -105,7 +105,7 @@
             intent.setClass(getContext(), EmlTempFileDeletionService.class);
             intent.setData(message.attachmentListUri);
 
-            getContext().startService(intent);
+            EmlTempFileDeletionService.enqueueWork(getContext(), intent);
         }
     }
 }

diff --git a/src/com/android/mail/browse/EmlMessageViewFragment.java b/src/com/android/mail/browse/EmlMessageViewFragment.java
index 2fbbb72..cb43af0 100644
--- a/src/com/android/mail/browse/EmlMessageViewFragment.java
+++ b/src/com/android/mail/browse/EmlMessageViewFragment.java

@@ -27,7 +27,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.OpenableColumns;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/src/com/android/mail/browse/EmlTempFileDeletionService.java b/src/com/android/mail/browse/EmlTempFileDeletionService.java
index 71a915c..8a772c3 100644
--- a/src/com/android/mail/browse/EmlTempFileDeletionService.java
+++ b/src/com/android/mail/browse/EmlTempFileDeletionService.java

@@ -17,25 +17,33 @@
 
 package com.android.mail.browse;
 
-import android.app.IntentService;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
+import androidx.core.app.JobIntentService;
+
 /**
  * {@link IntentService} that cleans up temporary files in the cache for the eml viewer.
  */
-public class EmlTempFileDeletionService extends IntentService {
+public class EmlTempFileDeletionService extends JobIntentService {
+
+    public static final int JOB_ID = 101;
 
     public EmlTempFileDeletionService() {
-        super("EmlTempFileDeletionService");
+        super();
     }
 
     public EmlTempFileDeletionService(String name) {
-        super(name);
+        super();
+    }
+
+    public static void enqueueWork(Context context, Intent work) {
+        enqueueWork(context, EmlTempFileDeletionService.class, JOB_ID, work);
     }
 
     @Override
-    protected void onHandleIntent(Intent intent) {
+    protected void onHandleWork(Intent intent) {
         final String action = intent.getAction();
         if (Intent.ACTION_DELETE.equals(action)) {
             final Uri uri = intent.getData();

diff --git a/src/com/android/mail/browse/MessageAttachmentBar.java b/src/com/android/mail/browse/MessageAttachmentBar.java
index 0274d66..9aa3baf 100644
--- a/src/com/android/mail/browse/MessageAttachmentBar.java
+++ b/src/com/android/mail/browse/MessageAttachmentBar.java

@@ -22,7 +22,7 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;

diff --git a/src/com/android/mail/browse/MessageFooterView.java b/src/com/android/mail/browse/MessageFooterView.java
index d5b65d7..1b9c8db 100644
--- a/src/com/android/mail/browse/MessageFooterView.java
+++ b/src/com/android/mail/browse/MessageFooterView.java

@@ -25,7 +25,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;

diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 724125e..18287d0 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java

@@ -23,7 +23,7 @@
 import android.content.res.Resources;
 import android.database.DataSetObserver;
 import android.graphics.Bitmap;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.text.Html;
 import android.text.Spannable;
 import android.text.Spanned;

diff --git a/src/com/android/mail/browse/SelectedConversationsActionMenu.java b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
index e2878bb..c8cf91c 100644
--- a/src/com/android/mail/browse/SelectedConversationsActionMenu.java
+++ b/src/com/android/mail/browse/SelectedConversationsActionMenu.java

@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.v7.view.ActionMode;
+import androidx.appcompat.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

diff --git a/src/com/android/mail/browse/SendersView.java b/src/com/android/mail/browse/SendersView.java
index 898568c..3319d5a 100644
--- a/src/com/android/mail/browse/SendersView.java
+++ b/src/com/android/mail/browse/SendersView.java

@@ -23,7 +23,7 @@
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.graphics.Typeface;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;

diff --git a/src/com/android/mail/browse/SubjectAndFolderView.java b/src/com/android/mail/browse/SubjectAndFolderView.java
index 8baf2ce..78b68d7 100644
--- a/src/com/android/mail/browse/SubjectAndFolderView.java
+++ b/src/com/android/mail/browse/SubjectAndFolderView.java

@@ -22,7 +22,7 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.text.Layout;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 644ded1..ef2f0a9 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java

@@ -49,10 +49,10 @@
 import android.os.HandlerThread;
 import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
-import android.support.v4.app.RemoteInput;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
+import androidx.core.app.RemoteInput;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
 import android.text.Editable;
 import android.text.Html;
 import android.text.SpanWatcher;

diff --git a/src/com/android/mail/drawer/DrawerItem.java b/src/com/android/mail/drawer/DrawerItem.java
index a360f12..cd8848f 100644
--- a/src/com/android/mail/drawer/DrawerItem.java
+++ b/src/com/android/mail/drawer/DrawerItem.java

@@ -16,7 +16,7 @@
 
 package com.android.mail.drawer;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/src/com/android/mail/photo/MailPhotoViewController.java b/src/com/android/mail/photo/MailPhotoViewController.java
index 28a88de..900571d 100644
--- a/src/com/android/mail/photo/MailPhotoViewController.java
+++ b/src/com/android/mail/photo/MailPhotoViewController.java

@@ -23,7 +23,7 @@
 import android.database.Cursor;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.print.PrintHelper;
+import androidx.print.PrintHelper;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

diff --git a/src/com/android/mail/preferences/MailPrefs.java b/src/com/android/mail/preferences/MailPrefs.java
index c8d83cd..1f277b5 100644
--- a/src/com/android/mail/preferences/MailPrefs.java
+++ b/src/com/android/mail/preferences/MailPrefs.java

@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
 import android.text.TextUtils;
 
 import com.android.mail.R;

diff --git a/src/com/android/mail/providers/FolderWatcher.java b/src/com/android/mail/providers/FolderWatcher.java
index d39a5fb..e6f4c60 100644
--- a/src/com/android/mail/providers/FolderWatcher.java
+++ b/src/com/android/mail/providers/FolderWatcher.java

@@ -21,7 +21,7 @@
 import android.content.Loader;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.android.mail.content.ObjectCursor;
 import com.android.mail.content.ObjectCursorLoader;

diff --git a/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java b/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java
index 6b172ee..3759c86 100644
--- a/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java
+++ b/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java

@@ -24,7 +24,7 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.android.mail.R;
 

diff --git a/src/com/android/mail/text/FolderSpan.java b/src/com/android/mail/text/FolderSpan.java
index 39c8ecf..6daa6e1 100644
--- a/src/com/android/mail/text/FolderSpan.java
+++ b/src/com/android/mail/text/FolderSpan.java

@@ -19,7 +19,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.style.ReplacementSpan;

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index a7de33b..5dcb728 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java

@@ -47,9 +47,9 @@
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.speech.RecognizerIntent;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.ActionBarDrawerToggle;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;

diff --git a/src/com/android/mail/ui/AbstractConversationViewFragment.java b/src/com/android/mail/ui/AbstractConversationViewFragment.java
index 9332c7b..3951a2e 100644
--- a/src/com/android/mail/ui/AbstractConversationViewFragment.java
+++ b/src/com/android/mail/ui/AbstractConversationViewFragment.java

@@ -26,7 +26,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

diff --git a/src/com/android/mail/ui/AbstractMailActivity.java b/src/com/android/mail/ui/AbstractMailActivity.java
index 5cf4128..e8fd522 100644
--- a/src/com/android/mail/ui/AbstractMailActivity.java
+++ b/src/com/android/mail/ui/AbstractMailActivity.java

@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.StrictMode;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;

diff --git a/src/com/android/mail/ui/AccountFeedbackActivity.java b/src/com/android/mail/ui/AccountFeedbackActivity.java
index e3cb592..8723f2c 100644
--- a/src/com/android/mail/ui/AccountFeedbackActivity.java
+++ b/src/com/android/mail/ui/AccountFeedbackActivity.java

@@ -20,8 +20,8 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 

diff --git a/src/com/android/mail/ui/ActionBarController.java b/src/com/android/mail/ui/ActionBarController.java
index 217c521..969ba19 100644
--- a/src/com/android/mail/ui/ActionBarController.java
+++ b/src/com/android/mail/ui/ActionBarController.java

@@ -22,7 +22,7 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/src/com/android/mail/ui/ActionableToastBar.java b/src/com/android/mail/ui/ActionableToastBar.java
index c6bf990..750bb3b 100644
--- a/src/com/android/mail/ui/ActionableToastBar.java
+++ b/src/com/android/mail/ui/ActionableToastBar.java

@@ -21,7 +21,7 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.MotionEvent;

diff --git a/src/com/android/mail/ui/ActivityController.java b/src/com/android/mail/ui/ActivityController.java
index f64b275..8430326 100644
--- a/src/com/android/mail/ui/ActivityController.java
+++ b/src/com/android/mail/ui/ActivityController.java

@@ -21,7 +21,7 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 2b38d27..3f21d84 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java

@@ -28,7 +28,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/src/com/android/mail/ui/BidiViewPagerHelper.java b/src/com/android/mail/ui/BidiViewPagerHelper.java
index ad97e49..9b0a88b 100644
--- a/src/com/android/mail/ui/BidiViewPagerHelper.java
+++ b/src/com/android/mail/ui/BidiViewPagerHelper.java

@@ -17,7 +17,7 @@
 
 package com.android.mail.ui;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 import com.android.mail.utils.ViewUtils;
 

diff --git a/src/com/android/mail/ui/ConversationListEmptyView.java b/src/com/android/mail/ui/ConversationListEmptyView.java
index 257d620..326282f 100644
--- a/src/com/android/mail/ui/ConversationListEmptyView.java
+++ b/src/com/android/mail/ui/ConversationListEmptyView.java

@@ -18,7 +18,7 @@
 package com.android.mail.ui;
 
 import android.content.Context;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 import android.widget.LinearLayout;

diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 439f6b5..0844cb2 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java

@@ -28,8 +28,8 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcelable;
-import android.support.annotation.IdRes;
-import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
+import androidx.annotation.IdRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -1242,7 +1242,7 @@
     }
 
     /* (non-Javadoc)
-     * @see android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener#onRefresh()
+     * @see androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener#onRefresh()
      */
     @Override
     public void onRefresh() {

diff --git a/src/com/android/mail/ui/ConversationTipView.java b/src/com/android/mail/ui/ConversationTipView.java
index 32c3fb7..7396426 100644
--- a/src/com/android/mail/ui/ConversationTipView.java
+++ b/src/com/android/mail/ui/ConversationTipView.java

@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 0f52cc705..5d5c86d 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java

@@ -28,10 +28,10 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v4.text.BidiFormatter;
-import android.support.v4.util.ArrayMap;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.core.text.BidiFormatter;
+import androidx.collection.ArrayMap;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;

diff --git a/src/com/android/mail/ui/ConversationViewFrame.java b/src/com/android/mail/ui/ConversationViewFrame.java
index de93334..7e76692 100644
--- a/src/com/android/mail/ui/ConversationViewFrame.java
+++ b/src/com/android/mail/ui/ConversationViewFrame.java

@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;

diff --git a/src/com/android/mail/ui/CustomViewToolbar.java b/src/com/android/mail/ui/CustomViewToolbar.java
index 6fe712a..fb444fc 100644
--- a/src/com/android/mail/ui/CustomViewToolbar.java
+++ b/src/com/android/mail/ui/CustomViewToolbar.java

@@ -20,7 +20,7 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/src/com/android/mail/ui/DrawerController.java b/src/com/android/mail/ui/DrawerController.java
index f752ef5..f29ec78 100644
--- a/src/com/android/mail/ui/DrawerController.java
+++ b/src/com/android/mail/ui/DrawerController.java

@@ -17,7 +17,7 @@
 
 package com.android.mail.ui;
 
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 
 /**
  * Drawer-related functionality.

diff --git a/src/com/android/mail/ui/FolderDisplayer.java b/src/com/android/mail/ui/FolderDisplayer.java
index 0e4139e..a1dbe28 100644
--- a/src/com/android/mail/ui/FolderDisplayer.java
+++ b/src/com/android/mail/ui/FolderDisplayer.java

@@ -24,7 +24,7 @@
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.graphics.Shader;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 
 import com.android.mail.R;
 import com.android.mail.providers.Conversation;

diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 3ac54f0..06f303d 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java

@@ -27,8 +27,8 @@
 import android.database.DataSetObserver;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.NonNull;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/src/com/android/mail/ui/FolderSelectionActivity.java b/src/com/android/mail/ui/FolderSelectionActivity.java
index 09dae1a..0dca213 100644
--- a/src/com/android/mail/ui/FolderSelectionActivity.java
+++ b/src/com/android/mail/ui/FolderSelectionActivity.java

@@ -26,7 +26,7 @@
 import android.database.DataSetObservable;
 import android.database.DataSetObserver;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;

diff --git a/src/com/android/mail/ui/GmailDragHelper.java b/src/com/android/mail/ui/GmailDragHelper.java
index 71c5227..d0ea08b 100644
--- a/src/com/android/mail/ui/GmailDragHelper.java
+++ b/src/com/android/mail/ui/GmailDragHelper.java

@@ -18,7 +18,7 @@
 package com.android.mail.ui;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.ViewConfiguration;

diff --git a/src/com/android/mail/ui/HelpFragment.java b/src/com/android/mail/ui/HelpFragment.java
index a680590..70c977b 100644
--- a/src/com/android/mail/ui/HelpFragment.java
+++ b/src/com/android/mail/ui/HelpFragment.java

@@ -28,7 +28,7 @@
 import android.print.PrintAttributes;
 import android.print.PrintDocumentAdapter;
 import android.print.PrintManager;
-import android.support.v4.print.PrintHelper;
+import androidx.print.PrintHelper;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/src/com/android/mail/ui/HtmlConversationTemplates.java b/src/com/android/mail/ui/HtmlConversationTemplates.java
index 124cb83..67e28e9 100644
--- a/src/com/android/mail/ui/HtmlConversationTemplates.java
+++ b/src/com/android/mail/ui/HtmlConversationTemplates.java

@@ -18,8 +18,8 @@
 package com.android.mail.ui;
 
 import android.content.Context;
-import android.support.v4.text.TextUtilsCompat;
-import android.support.v4.view.ViewCompat;
+import androidx.core.text.TextUtilsCompat;
+import androidx.core.view.ViewCompat;
 
 import com.android.mail.R;
 import com.android.mail.utils.LogTag;

diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java
index c497cc6..2d4b991 100644
--- a/src/com/android/mail/ui/MailActivity.java
+++ b/src/com/android/mail/ui/MailActivity.java

@@ -27,9 +27,9 @@
 import android.nfc.NfcAdapter;
 import android.nfc.NfcEvent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.view.ActionMode;
+import androidx.appcompat.widget.Toolbar;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/src/com/android/mail/ui/MailSwipeRefreshLayout.java b/src/com/android/mail/ui/MailSwipeRefreshLayout.java
index 9a2f68c..af71dae 100644
--- a/src/com/android/mail/ui/MailSwipeRefreshLayout.java
+++ b/src/com/android/mail/ui/MailSwipeRefreshLayout.java

@@ -18,7 +18,7 @@
 package com.android.mail.ui;
 
 import android.content.Context;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.AttributeSet;
 import android.view.View;
 

diff --git a/src/com/android/mail/ui/MailboxSelectionActivity.java b/src/com/android/mail/ui/MailboxSelectionActivity.java
index 9605f09..4fb434a 100644
--- a/src/com/android/mail/ui/MailboxSelectionActivity.java
+++ b/src/com/android/mail/ui/MailboxSelectionActivity.java

@@ -36,7 +36,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;

diff --git a/src/com/android/mail/ui/MaterialSearchActionView.java b/src/com/android/mail/ui/MaterialSearchActionView.java
index 7b248ce..9f410dd 100644
--- a/src/com/android/mail/ui/MaterialSearchActionView.java
+++ b/src/com/android/mail/ui/MaterialSearchActionView.java

@@ -21,7 +21,7 @@
 import android.content.res.Resources;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;

diff --git a/src/com/android/mail/ui/NestedFolderTeaserView.java b/src/com/android/mail/ui/NestedFolderTeaserView.java
index f3fe63e..fef1df2 100644
--- a/src/com/android/mail/ui/NestedFolderTeaserView.java
+++ b/src/com/android/mail/ui/NestedFolderTeaserView.java

@@ -23,8 +23,8 @@
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.text.BidiFormatter;
-import android.support.v4.util.SparseArrayCompat;
+import androidx.core.text.BidiFormatter;
+import androidx.collection.SparseArrayCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;

diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index ef42ab9..1e5ebaa 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java

@@ -25,8 +25,8 @@
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.LayoutRes;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;

diff --git a/src/com/android/mail/ui/RecentFolderList.java b/src/com/android/mail/ui/RecentFolderList.java
index f2de589..21d172f 100644
--- a/src/com/android/mail/ui/RecentFolderList.java
+++ b/src/com/android/mail/ui/RecentFolderList.java

@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.android.mail.content.ObjectCursor;
 import com.android.mail.providers.Account;

diff --git a/src/com/android/mail/ui/RestrictedActivity.java b/src/com/android/mail/ui/RestrictedActivity.java
index 364f677..1eacc88 100644
--- a/src/com/android/mail/ui/RestrictedActivity.java
+++ b/src/com/android/mail/ui/RestrictedActivity.java

@@ -25,8 +25,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.view.ActionMode;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.view.ActionMode;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -36,9 +36,9 @@
 
 /**
  * {@link RestrictedActivity} gives access to a subset of
- * {@link android.support.v7.app.AppCompatActivity} methods.
+ * {@link androidx.appcompat.app.AppCompatActivity} methods.
  * These methods match the signatures from
- * {@link android.support.v7.app.AppCompatActivity}.
+ * {@link androidx.appcompat.app.AppCompatActivity}.
  */
 public interface RestrictedActivity {
     /*
@@ -57,7 +57,7 @@
     void finish();
 
     /**
-     * @see android.support.v7.app.AppCompatActivity#getSupportActionBar()
+     * @see androidx.appcompat.app.AppCompatActivity#getSupportActionBar()
      */
     ActionBar getSupportActionBar();
 
@@ -102,7 +102,7 @@
     Window getWindow();
 
     /**
-     * @see android.support.v7.app.AppCompatActivity#supportInvalidateOptionsMenu()
+     * @see androidx.appcompat.app.AppCompatActivity#supportInvalidateOptionsMenu()
      */
     void supportInvalidateOptionsMenu();
 
@@ -147,7 +147,7 @@
     void showDialog(int id);
 
     /**
-     * @see android.support.v7.app.AppCompatActivity#startSupportActionMode(ActionMode.Callback)
+     * @see androidx.appcompat.app.AppCompatActivity#startSupportActionMode(ActionMode.Callback)
      */
     ActionMode startSupportActionMode(ActionMode.Callback callback);
 

diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 44600d3..7ad4ec6 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java

@@ -23,9 +23,9 @@
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.v7.app.ActionBar;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.appcompat.app.ActionBar;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.View;

diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java
index 498dfc2..9fcb83c 100644
--- a/src/com/android/mail/ui/TwoPaneLayout.java
+++ b/src/com/android/mail/ui/TwoPaneLayout.java

@@ -28,7 +28,7 @@
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;

diff --git a/src/com/android/mail/utils/EmptyStateUtils.java b/src/com/android/mail/utils/EmptyStateUtils.java
index 93435a2..e52c807 100644
--- a/src/com/android/mail/utils/EmptyStateUtils.java
+++ b/src/com/android/mail/utils/EmptyStateUtils.java

@@ -18,7 +18,7 @@
 package com.android.mail.utils;
 
 import android.content.res.Resources;
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.widget.ImageView;
 import android.widget.TextView;
 

diff --git a/src/com/android/mail/utils/FragmentStatePagerAdapter2.java b/src/com/android/mail/utils/FragmentStatePagerAdapter2.java
index 752e127..e0c1e6d 100644
--- a/src/com/android/mail/utils/FragmentStatePagerAdapter2.java
+++ b/src/com/android/mail/utils/FragmentStatePagerAdapter2.java

@@ -21,10 +21,10 @@
 import android.app.FragmentTransaction;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v13.app.FragmentCompat;
-import android.support.v13.app.FragmentStatePagerAdapter;
-import android.support.v4.util.SparseArrayCompat;
-import android.support.v4.view.PagerAdapter;
+import androidx.legacy.app.FragmentCompat;
+import androidx.legacy.app.FragmentStatePagerAdapter;
+import androidx.collection.SparseArrayCompat;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 

diff --git a/src/com/android/mail/utils/NotificationActionUtils.java b/src/com/android/mail/utils/NotificationActionUtils.java
index 72401c0..b3935f6 100644
--- a/src/com/android/mail/utils/NotificationActionUtils.java
+++ b/src/com/android/mail/utils/NotificationActionUtils.java

@@ -28,9 +28,9 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.RemoteInput;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.RemoteInput;
+import androidx.core.app.TaskStackBuilder;
 import android.widget.RemoteViews;
 
 import com.android.mail.MailIntentService;
@@ -188,7 +188,7 @@
 
     /**
      * Adds the appropriate notification actions to the specified
-     * {@link android.support.v4.app.NotificationCompat.Builder}
+     * {@link androidx.core.app.NotificationCompat.Builder}
      *
      * @param notificationIntent The {@link Intent} used when the notification is clicked
      * @param when The value passed into {@link android.app.Notification.Builder#setWhen(long)}.

diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 456d47a..7337b8c 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java

@@ -31,10 +31,10 @@
 import android.os.Looper;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.text.BidiFormatter;
-import android.support.v4.util.ArrayMap;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.text.BidiFormatter;
+import androidx.collection.ArrayMap;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -1444,7 +1444,7 @@
      * @param subject Subject of the new message that triggered the notification
      * @param snippet Snippet of the new message that triggered the notification
      * @return a {@link CharSequence} suitable for use in
-     *         {@link android.support.v4.app.NotificationCompat.BigTextStyle}
+     *         {@link androidx.core.app.NotificationCompat.BigTextStyle}
      */
     private static CharSequence getSingleMessageInboxLine(Context context,
             String senders, String subject, String snippet) {
@@ -1517,7 +1517,7 @@
      * @param subject Subject of the new message that triggered the notification
      * @param message the {@link Message} to be displayed.
      * @return a {@link CharSequence} suitable for use in
-     *         {@link android.support.v4.app.NotificationCompat.BigTextStyle}
+     *         {@link androidx.core.app.NotificationCompat.BigTextStyle}
      */
     private static CharSequence getSingleMessageBigText(Context context, String subject,
             final Message message) {

diff --git a/src/com/android/mail/utils/ObservableSparseArrayCompat.java b/src/com/android/mail/utils/ObservableSparseArrayCompat.java
index 2dea44e..dbb7354 100644
--- a/src/com/android/mail/utils/ObservableSparseArrayCompat.java
+++ b/src/com/android/mail/utils/ObservableSparseArrayCompat.java

@@ -16,7 +16,7 @@
 package com.android.mail.utils;
 
 import android.database.DataSetObservable;
-import android.support.v4.util.SparseArrayCompat;
+import androidx.collection.SparseArrayCompat;
 
 public class ObservableSparseArrayCompat<E> extends SparseArrayCompat<E> {
     private final DataSetObservable mDataSetObservable;

diff --git a/src/com/android/mail/utils/StringUtils.java b/src/com/android/mail/utils/StringUtils.java
index e3ea10c..a88324b 100644
--- a/src/com/android/mail/utils/StringUtils.java
+++ b/src/com/android/mail/utils/StringUtils.java

@@ -1,6 +1,6 @@
 package com.android.mail.utils;
 
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 
 /**
  * A small utility class for working with strings.

diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index c4689a7..ff93d07 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java

@@ -35,8 +35,8 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Browser;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextUtils;

diff --git a/src/com/android/mail/utils/ViewUtils.java b/src/com/android/mail/utils/ViewUtils.java
index 1e6cb37..bf53680 100644
--- a/src/com/android/mail/utils/ViewUtils.java
+++ b/src/com/android/mail/utils/ViewUtils.java

@@ -19,8 +19,8 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.ColorRes;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.ColorRes;
+import androidx.core.view.ViewCompat;
 import android.view.View;
 import android.view.ViewParent;
 import android.view.Window;

diff --git a/src/com/android/mail/widget/BaseWidgetProvider.java b/src/com/android/mail/widget/BaseWidgetProvider.java
index bbfe1cc..bbed266 100644
--- a/src/com/android/mail/widget/BaseWidgetProvider.java
+++ b/src/com/android/mail/widget/BaseWidgetProvider.java

@@ -86,9 +86,13 @@
      * IDs based on the widget_provider string resource. When subclassing, be sure to either
      * override this method or provide the correct provider name in the string resource.
      *
-     * @return the list ids for the currently configured widgets.
+     * @return the list ids for the currently configured widgets. If widgets are not supported or
+     * there are no widgets, empty array (new int[0]) will be returned.
      */
-    protected int[] getCurrentWidgetIds(Context context) {
+    private int[] getCurrentWidgetIdsIfSupported(Context context) {
+        if (!WidgetService.isWidgetSupported(context)) {
+            return new int[0];
+        }
         final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
         final ComponentName mailComponent = new ComponentName(context, getProviderName(context));
         return appWidgetManager.getAppWidgetIds(mailComponent);
@@ -153,7 +157,7 @@
                 return;
             }
             final Set<Integer> widgetsToUpdate = Sets.newHashSet();
-            for (int id : getCurrentWidgetIds(context)) {
+            for (int id : getCurrentWidgetIdsIfSupported(context)) {
                 // Retrieve the persisted information for this widget from
                 // preferences.
                 final String accountFolder = MailPrefs.get(context).getWidgetConfiguration(id);
@@ -178,8 +182,10 @@
             }
             if (widgetsToUpdate.size() > 0) {
                 final int[] widgets = Ints.toArray(widgetsToUpdate);
-                AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgets,
-                        R.id.conversation_list);
+                if (WidgetService.isWidgetSupported(context)) {
+                    AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgets,
+                            R.id.conversation_list);
+                }
             }
         }
     }
@@ -351,7 +357,9 @@
                     folderDisplayName == null ? " " : folderDisplayName);
 
         }
-        AppWidgetManager.getInstance(context).updateAppWidget(appWidgetId, remoteViews);
+        if (WidgetService.isWidgetSupported(context)) {
+            AppWidgetManager.getInstance(context).updateAppWidget(appWidgetId, remoteViews);
+        }
     }
 
     protected boolean isAccountValid(Context context, Account account) {
@@ -392,7 +400,7 @@
     }
 
     private void migrateAllLegacyWidgetInformation(Context context) {
-        final int[] currentWidgetIds = getCurrentWidgetIds(context);
+        final int[] currentWidgetIds = getCurrentWidgetIdsIfSupported(context);
         migrateLegacyWidgets(context, currentWidgetIds);
     }
 
@@ -407,7 +415,7 @@
     }
 
     private void validateAllWidgetInformation(Context context) {
-        final int[] widgetIds = getCurrentWidgetIds(context);
+        final int[] widgetIds = getCurrentWidgetIdsIfSupported(context);
         for (int widgetId : widgetIds) {
             final String accountFolder = MailPrefs.get(context).getWidgetConfiguration(widgetId);
             String accountUri = null;

diff --git a/src/com/android/mail/widget/WidgetService.java b/src/com/android/mail/widget/WidgetService.java
index 22c74a7..c1f389d 100644
--- a/src/com/android/mail/widget/WidgetService.java
+++ b/src/com/android/mail/widget/WidgetService.java

@@ -15,6 +15,7 @@
  */
 package com.android.mail.widget;
 
+import android.annotation.TargetApi;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.content.Context;
@@ -22,11 +23,13 @@
 import android.content.Intent;
 import android.content.Loader;
 import android.content.Loader.OnLoadCompleteListener;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Looper;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.TaskStackBuilder;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -70,6 +73,23 @@
         return new MailFactory(getApplicationContext(), intent, this);
     }
 
+    /** Checks if widgets are supported. */
+    public static boolean isWidgetSupported(Context context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            return hasAppWidgetsSystemFeature(context);
+        } else {
+            // Before SDK 18, we can assume AppWidgetManager#getInstance will
+            // never return null, so we can always return true regardless of
+            // whether the widgets are really supported.
+            return true;
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    private static boolean hasAppWidgetsSystemFeature(Context context) {
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS);
+    }
+
     protected void configureValidAccountWidget(Context context, RemoteViews remoteViews,
             int appWidgetId, Account account, final int folderType, final int folderCapabilities,
             final Uri folderUri, final Uri folderConversationListUri, String folderName) {

diff --git a/tests/Android.mk b/tests/Android.mk
index 07fdded..5928e5b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk

@@ -23,22 +23,20 @@
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-# LOCAL_JAVA_LIBRARIES := android.test.runner
-
 LOCAL_SDK_VERSION := current
+LOCAL_MIN_SDK_VERSION := 14
 LOCAL_PACKAGE_NAME := UnifiedEmailTests
 LOCAL_INSTRUMENTATION_FOR := UnifiedEmail
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules
 
 LOCAL_JAVA_LIBRARIES := \
     android.test.mock.stubs \
     android.test.runner.stubs \
     android.test.base.stubs \
 
-
 include $(BUILD_PACKAGE)
 
 # Build all sub-directories

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 1400442..aa5f8ea 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml

@@ -18,32 +18,22 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.mail.emailtests">
 
-    <uses-sdk android:targetSdkVersion="19" android:minSdkVersion="14" />
+    <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="14" />
 
     <!-- We add an application tag here just so that we can indicate that
          this package needs to link against the android.test library,
          which is needed when building test cases. -->
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
-        <provider android:name="TestFileProvider" android:authorities="testfile"
-                  android:syncable="false" android:multiprocess="false" />
-        <activity android:name="TestFilePicker" android:label="Pick test file">
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.OPENABLE" />
-            </intent-filter>
-        </activity>
     </application>
 
     <!--
     This declares that this app uses the instrumentation test runner targeting
     the package of com.android.mail.  To run the tests use the command:
-    "adb shell am instrument -w com.android.mail.emailtests/android.support.test.runner.AndroidJUnitRunner"
-i
+    "adb shell am instrument -w com.android.mail.emailtests/androidx.test.runner.AndroidJUnitRunner"
     -->
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                      android:targetPackage="com.android.mail"
-                     android:label="Tests for Email."/>
+                     android:label="Tests for UnifiedEmail."/>
 
 </manifest>

diff --git a/tests/src/com/android/mail/browse/MessageHeaderViewTest.java b/tests/src/com/android/mail/browse/MessageHeaderViewTest.java
index f5fd557..52eab7f 100644
--- a/tests/src/com/android/mail/browse/MessageHeaderViewTest.java
+++ b/tests/src/com/android/mail/browse/MessageHeaderViewTest.java

@@ -17,7 +17,7 @@
 
 package com.android.mail.browse;
 
-import android.support.v4.text.BidiFormatter;
+import androidx.core.text.BidiFormatter;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 

diff --git a/tests/src/com/android/mail/browse/SendersFormattingTests.java b/tests/src/com/android/mail/browse/SendersFormattingTests.java
index 14b31ec..979b880 100644
--- a/tests/src/com/android/mail/browse/SendersFormattingTests.java
+++ b/tests/src/com/android/mail/browse/SendersFormattingTests.java

@@ -272,7 +272,7 @@
             final Map<String, Object> map = new HashMap<>(2);
             map.put(UIProvider.AccountColumns.NAME, "Fred Flintstone");
             map.put(UIProvider.AccountColumns.ACCOUNT_MANAGER_NAME, "fflintstone@example.com");
-            map.put(UIProvider.AccountColumns.TYPE, "IMAP");
+            map.put(UIProvider.AccountColumns.TYPE, "POP3");
             map.put(UIProvider.AccountColumns.PROVIDER_VERSION, 1);
             map.put(UIProvider.AccountColumns.CAPABILITIES, 0);
 
@@ -283,4 +283,4 @@
             throw new RuntimeException(je);
         }
     }
-}
\ No newline at end of file
+}
commit	f00746d5f0e009d7e2e74ac3c8527c19f3738735	[log] [tgz]
author	Xin Li <delphij@google.com>	Tue Aug 13 16:36:39 2019 -0700
committer	Xin Li <delphij@google.com>	Tue Aug 13 16:39:33 2019 -0700
tree	4e162b1d4dfd51b3d85fcc3235b46a75b1a19a18
parent	516e349b34789a1668a801c21e3184c525aae0ef [diff]
parent	ce31c9139309cf3ff1f8e02e06be470ff3c61b3d [diff]