From 3db9542af6be894a4b053c3c6eb9baf456cc8a44 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 5 Mar 2009 14:34:38 -0800
Subject: [PATCH] auto import from //depot/cupcake/@136594

---
 res/drawable/btn_email_focused_63.png         | Bin 1226 -> 0 bytes
 res/drawable/btn_email_pressed_63.png         | Bin 1225 -> 0 bytes
 res/drawable/btn_icon_bg_focused.9.png        | Bin 0 -> 782 bytes
 res/drawable/btn_icon_bg_pressed.9.png        | Bin 0 -> 701 bytes
 res/drawable/btn_prev_next.xml                |   4 +-
 res/layout/message_view.xml                   |  36 ++++++------------
 res/values-cs/strings.xml                     |   9 +++--
 res/values-de/strings.xml                     |   9 +++--
 res/values-es/strings.xml                     |   9 +++--
 res/values-fr/strings.xml                     |   9 +++--
 res/values-it/strings.xml                     |   9 +++--
 res/values-ja/strings.xml                     |   9 +++--
 res/values-ko/strings.xml                     |   9 +++--
 res/values-nb/strings.xml                     |   9 +++--
 res/values-nl/strings.xml                     |   9 +++--
 res/values-pl/strings.xml                     |   9 +++--
 res/values-ru/strings.xml                     |   9 +++--
 res/values-zh-rCN/strings.xml                 |   9 +++--
 res/values-zh-rTW/strings.xml                 |   9 +++--
 res/values/strings.xml                        |  31 +++++++++++----
 .../android/email/activity/MessageView.java   |  27 +------------
 .../android/email/service/MailService.java    |   8 +++-
 22 files changed, 109 insertions(+), 114 deletions(-)
 delete mode 100755 res/drawable/btn_email_focused_63.png
 delete mode 100755 res/drawable/btn_email_pressed_63.png
 create mode 100755 res/drawable/btn_icon_bg_focused.9.png
 create mode 100755 res/drawable/btn_icon_bg_pressed.9.png

diff --git a/res/drawable/btn_email_focused_63.png b/res/drawable/btn_email_focused_63.png
deleted file mode 100755
index f0cb73e8ea88d27da3ced6548ab10f39e5bedf43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1226
zcmV;*1U37KP)<h;3K|Lk000e1NJLTq002M$001=z1^@s6@rLcJ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$Y)M2xRCwC#TD@)*K@9e7yy1}OsZyX6
zDN-R`0Z}0F2r216qDV=}BT&)u4irc{0!<|7(m<7pGKa?8F-b0Av+>X8y}e68R!Zz$
z&+OVB|BY`Zi^YOIJ)3OJh+a*J4k~<7Ayr5a<O-z+mvkZwN5)-2QND@tdI7&y__4zG
z&p$8zOuoFJ?fXRED{c3*{;N2-kOO)L5{M(?Qc$3A#})4LqX+c*OnBnuL=PsFK_HHd
z8!WUf({6=tCch5o$CPR3OaUazul8|LaPQeBFO6qXa9zF=u1>Kt?K+}#a81CzLgbbd
z(G{u-$-%okU&#8fnTjK1e<J#v9fc97Sc?~S7Kja=SXr>8+^lLdVxs?IO_07diDP9E
zjRAf<s}yCfT>SC1NgQaM!27XQKcZQJu@WDQIgR-uOS^~_oLw!5Bed30FehA9k&9h{
z5x@2rM3jKitZx*<+}Vx(S9oKZK0D8?6<pWlEmG@PY2?D(wE&6-hbxYzBT@X)qDASq
z&rfl9lACiIx8Om9XTa}P33Q${aNxQ?dgj!}+kx3&okdXJB3i=|j8xgARv!`GD@Qea
z2#u9-QC(tKL8E>&T73>u<CrcmHSov<+Dv?nDy<fb$m?(eEkFY4?TYW>&uLQ3vtz2f
zrWk<6C?2*54fI0fgF>6T*h!a31vOzE-6nTyn^XeAS8G`8H3i5(GxAm*4TcEKQ?ev@
zRo>C0S1z+N9BVfyL6=H~2jNC7OOX~7Y8erpp|KNyGyL7K084{yGB`$kxgmuR1-%M#
z8aY5s(6|~afCXsGXEsC;O_Wxa_APM~SRxC!ivf2r;6IN6*2~HYMb21tfac@cqOBAI
zte3Um3Jo=X0%=k46~%y+EdX_ab?gTa#Y8b+umx<o(}Q+_&=P#*EO5D>mPEkX#12r#
zvpjaAXbCzi+O||iZjEu!3d_2o`pZ!7_p;Czk)7DsS%8u&FF=qMZ#zs%DilRYlFaRW
z9HB`fPDBAvw1$YsXg3Zp(6`%EK%^CvBS=e3ivyAWj_v=e&M%pspl8-4S+=gD6!y{|
z%9Ap#fum+g2AeTs0Ah7CEKW4x>i25`i}7{4fEeG>lu>%TI+nq3Fe^ZHMjKMXswKE+
znHT*9rYIYwA$|HWGl7@#0;MukbF-5j$}N?~LtA%ZWdUSTU!#R?_bS1vM=m4UUcib4
z-s!7i?7<6w6F_SLWg{ytT4l^&r^P#er@2Z=;+b)X;7H0nKO^+-*eHH>$5O<)V*n>I
zfne6b=ITqr0yfn&nE_j3Bn>lNJ1YB=&Q6O9xDU5FMl;Ht4$GVr%WjF$Q{zG>TW=rJ
zc768roG@Pwn0Njf1D|(t$h-rG;2GLnp<N2seI^RM8>=p4eK$FMN%v|9_*QRr%~O_{
zv%%=`l}x}D3eWq6?XsKSJFfTp&Gf_KcfH-KH;47%ky#XJwYV5H!mQ`F5$@5%c=ycN
ogZRHu9#wc)@As(6{#Sqj05`3%Tcu$+oB#j-07*qoM6N<$f=0YEmjD0&

diff --git a/res/drawable/btn_email_pressed_63.png b/res/drawable/btn_email_pressed_63.png
deleted file mode 100755
index f89edef815c3dccfa2152e2ffdd907d8d8b89df8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1225
zcmV;)1UCDLP)<h;3K|Lk000e1NJLTq002M$001=z1^@s6@rLcJ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$Ye_^wRCwC#TDx-7P!L^<704Y_R4JGg
zDN^z$^!Wprp~%qj3(!E568?dXPoT*RbZMYU1)am(Wz02`Ok{Z<XXQr<tQqH8R~u;`
zXP?$&KA+R4SCe~JLeD#<le#{wE7g@!E7g^jS2Fepq;=OUf4A$Gx_+$dyJv6ae<q(_
z)BR~n-|9UNXZ6ptem1p|u}2{7me-3}p<{mXh+b5c9#YlNv}$N3*F^RERIZ6{_IYp<
z_8&sV9)Yy*D$2RWe_t;CC-ck6&olbob#y?{!OFQ9*LHD8kB2@l{p-Q;>xwS9TK}Ny
zlp7+#cXaoMrGTLl6oozP=yB7LA+#nu_s%(>v-Y+{%LY#Yzr18o1{jKvaTiJu<+?cT
zDnkVb`0%VkEM!T7)`GPagTzsUqL60gW>Fy2T!J0VYfNNlEgl4P#{jL(lJ?p0DF%cf
zBQRRQGDB+##17oOI3U9qK#2_Cp+a`(3R>0@CqB?>CTLV)P#@Qj;Q1qsp!E<SYs4q&
zyFlcZh~;m-x4~Y9*7_b9ED^*T*S9DUWLo9i+CyoJvF|B0nZ24Y-4G~zQJ5<R!zgVV
zC}U0dFQ-APs`8M~Is#gIS=wT_Lotwp!k;|^AOWfEF;@b2Ajf(UZ3{e~#-pQwE4@e=
zWB(tpl3DOrs9}(AUMN5kf=1Tal;BpUCk{^$0w_X2R67p?SOJR@F`6xu)~Zs;uzm(v
zONEdGaP!g=JLTzcPZG4GAV4dChNz7C3F*541=Skj^WxOtViYb2tyTAX)oKCy7Pk<J
zGC%>+&L%rTtCp9bAd{d>U)l1S3IXDP1a&&cy}8=3cqkL6ZXjn)D18L%v%o$J?6bf=
z3;f4fph-s!E&4NIqiF(#W*{)4Gs7UhHK`F7(s>EEhtP_FOz+pA5}+qkKr~k`Bihcf
zsnD__2PrYKydVgmq~$kN{Gh{7Bu2?PLD0H+tMuNoB_)Va#W4^B!N4BJfCvd<_$WDw
zL208hSsdel!LorYKSV*<K>!>IF-(7wKqlEeK?A*5Aa@uCM9KRSq~=Ht?pK1@w>yfH
z5w`KO7zc_h3Emm$29cbM)Y(=5lLRdRonVG<<@w{s;zPeH3G0+KEg2z^ahV!d%MzfV
zDBWQhTpR9XXuXw4|FuXAd00nO0}VkaP{OVepeZbJ6Y<iZ1U`qpf~KV-Yk)GA))HKR
zH~=?8s1jsN>z0IX7e{bT25+%qfHfRNZYBxMOU_DWHi_m3Ko(=O)AA<7R)23zZrQ2w
z5ZX+yfL5U5App6dBp$p@IgHRp{_kW3|24Uc60ATfAX5^!f%dGd0u?%T{hosX36H1*
z*NFw2m@ExkZGnIvP~?|HCfLO>ws>2PGnWemym#NaM15}8A9B8<?KRQc$?O9?=sNmZ
zFCMN88<01zD3}geZiLXHLlV>_mY;KRC3M_$C-dL+<fv|**7aOvCJJ_F^(6_vPv-OR
nzPH9Zub<QUIa<j6SAYQkAjRW<Fri{X00000NkvXXu0mjfH`yx6

diff --git a/res/drawable/btn_icon_bg_focused.9.png b/res/drawable/btn_icon_bg_focused.9.png
new file mode 100755
index 0000000000000000000000000000000000000000..81857f4d1dfe0df6053e0ef19fcda9f1d676fc24
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf0008jNkl<Zc-qyN
z+iuf95Qg{B@))6<N^ug$bqh3YC@oMZhj++3<q0^bMgne-fP%P4gSyNp^PB0^yEUQ;
zOQi3@8)xRrKkFRq+~q#JyX?p7uIs$&y2+catKN2<Unbm>d$YqisiP}y`fkPf_g9_&
zaLxITZMZJnFkrn!4erG~xi>qUkvm#(6F%t^75%#E{4w$ER)96)HjxoMp>M!?Cg-k&
z>v1pc$-UWuU1~8}s6O9x{s$G9QLz(ZZlOl=0g)3!q9E3V(t!0s&dueuz4LXs7x(1e
z?7%Ly7~Ap_eBvp+W3Qoto(g+v;;EV6AU26R!d>B>fMYzrDX&?V8oAU|J-Fvw<k+Pa
z<0xk#si71tl@LU>h*5woB?`e(Y7Lv^*nwSYF`hF=8k9mx5aPz$!j3Q&aE#|iN>HcQ
zAjb~J3$cY9Z^C&NkwQvH2qO1|T?5u3iUg5fK#m>QB`lU3DU1yXLFR$5XTUlnks!va
z<?^;-1KFgd8Xu&P5@hy?hXMALB+}bf$zjhGzf+5gVT3U$2t5)W8?X++m>fnL6+>Ej
zgd;URE5#BA#1q4T60~wV>Vm*XCAF|vZqf=#X`!dWp@3s87?RVe<uS3L%pGZAguAj|
zkd&5UnP-MWBZuVnq!vbs)XGKgX0e_bBlea~3*)m=&ka@%W7Vl)uc>jeLtLzBj5;kV
z^}=A~bZSlGjEeOG`%8~erxlX2aym6V&W3%)4skJDjpKk=Q(7;Drqr6m#_H<)-^6^{
zqfB=5C;M@c><4VpUrEV+i6{HBC+Q!G$^NuX`p?Ke`uo;SY{`FkjhKszE$J3POsoou
z+4KsP;D!>_V7*jA!?2JMtF+kU<RUSfAS5BGDU?ipv5>w+z%I4emsQu9Wo~-fZz-oG
zA*va)moYb0rtEU&uHyI1b$(`ULMK%IPX+%H?#aE`q3w;{WzhKe1=ZnM83EeJKmY&$
M07*qoM6N<$f{5aMxc~qF

literal 0
HcmV?d00001

diff --git a/res/drawable/btn_icon_bg_pressed.9.png b/res/drawable/btn_icon_bg_pressed.9.png
new file mode 100755
index 0000000000000000000000000000000000000000..9201624d2b8f99af9f49874cd8f216531815185d
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf0007nNkl<Zc-qz2
z+inv<3<h97THmmus(=-uEzpE)(v(6V917(H@&p{zAVF`CIHcmDEn=8ovKPl$?@pu;
zhDiTKC)4#Od$dWGXtl3EtA4%Rq>VS5RJ^-J)Aw5x))~}9Z5S3%r&~1nuub9Pbqb$u
zP&m7}o}d<LqBab3xYKPau<7$H3g31peBY%o^RgFnhjUlu9!IaqzCHhXsD+xS4FfC{
z?5v>am)jJ6#EV?)Q@HF<xU%WS+>hzSl$<_iU?S_XugCw}UA!)8p(bj>080gf7H?qV
zuXusbQ;8Q2u}Fvo!$Hh2=8*G1<%px#WZ#hgcfi*w=WC!QYQq3a1w$*LPDTmjVM~q_
zFaZYxEENoMMoVi^9_SHg<V4>0fHgQ6V5x39ID}W7M3e?S<~%Wxbq!3w!7yut$@m1N
zyEHPGu@j9PneGWr#+n2x)tQn`)uB-QDd(AqtdAX>bWYA(nF7-z)Z-J>*kGPJ(a5pE
z$yoJB8)0S52tAYlUT}^%^0x+hI6cy`3D$Q;DC5&8jd^LJks2psts7}S6{fo-XUd{9
z<`u^RHBQc)?OG$OtH#*Yt>YSyjmEWgjmHT?8qA(8+buzym}s2tnmubv!43_qZj8EH
zCr)(Nym9Jt)(AT=H`F?q*R9tauWKGmowNT27V;lu)`vg4+eNlF*sMR2vi%Ux_G?ep
zUlg<bYMu3uk$?2_Ee*EjAG`)e&9F5+B4~n5U6=<Hq=st9Q0;308Q7nPDzhCbF56%h
zD9C}q>a~6vNIxQgrGkCkrHzYynk+n2NkKMciEHsgl?g0!PZiJO!p{yBal>>e+zNu4
jsC{lxEf0JDX580rccYNlg=Q#C00000NkvXXu0mjfqAEi-

literal 0
HcmV?d00001

diff --git a/res/drawable/btn_prev_next.xml b/res/drawable/btn_prev_next.xml
index f65e9f21d..788fed0ed 100644
--- a/res/drawable/btn_prev_next.xml
+++ b/res/drawable/btn_prev_next.xml
@@ -19,6 +19,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_email_pressed_63" />
-    <item android:state_focused="true" android:drawable="@drawable/btn_email_focused_63" />
+    <item android:state_pressed="true" android:drawable="@drawable/btn_icon_bg_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/btn_icon_bg_focused" />
 </selector>
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index ed6cb256a..3c1a10414 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -31,40 +31,28 @@
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
-            <!-- Note, true height is 2+53+0. Note there is a 4pixel fade on top of header image -->
+            <!-- Note, height is 2+35+0.  There is a 4pixel fade on top of header image -->
             <RelativeLayout
                 android:layout_width="fill_parent"
-                android:layout_height="55dip"
+                android:layout_height="37dip"
                 android:paddingTop="2dip"
-                android:paddingLeft="7dip"
-                android:paddingRight="7dip">
-                <Button
+                android:paddingLeft="6dip"
+                android:paddingRight="9dip">
+                <ImageButton
                     android:id="@+id/previous"
-                    android:text="@string/message_view_prev_action"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
-                    android:layout_height="53dip"
-                    android:layout_width="64dip"
+                    android:layout_height="35dip"
+                    android:layout_width="40dip"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentTop="true"
-	                android:paddingTop="7dip"
-	                android:paddingBottom="7dip"
-                    android:drawableTop="@drawable/ic_left_prev_arrow_default"
-                    android:drawablePadding="0dip"
+                    android:src="@drawable/ic_left_prev_arrow_default"
                     android:background="@drawable/btn_prev_next" />
-                <Button
+                <ImageButton
                     android:id="@+id/next"
-                    android:text="@string/message_view_next_action"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
-                    android:layout_height="53dip"
-                    android:layout_width="64dip"
+                    android:layout_height="35dip"
+                    android:layout_width="40dip"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentTop="true" 
-	                android:paddingTop="7dip"
-	                android:paddingBottom="7dip"
-                    android:drawableTop="@drawable/ic_right_next_arrow_default"
-                    android:drawablePadding="0dip"
+                    android:src="@drawable/ic_right_next_arrow_default"
                     android:background="@drawable/btn_prev_next" />
             </RelativeLayout>
 
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index feddd06ec..ce0ce9cc6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Chyba připojení"</string>
     <string name="status_loading_more_failed">"Opakovat načítání dalších zpráv"</string>
     <string name="notification_new_title">"Nový e-mail"</string>
-    <string name="notification_new_one_account_fmt">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>(<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"v(e) <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtech"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Doručená pošta"</string>
     <string name="accounts_welcome">"Vítá vás nastavení aplikace Email!"\n\n"V aplikaci Email můžete používat jakékoli e-mailové účty."\n\n"Nejznámější e-mailové účty lze nastavit ve dvou krocích!"</string>
     <string name="debug_version_fmt">"Verze: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Kopie:"</string>
     <string name="message_view_attachment_view_action">"Otevřít"</string>
     <string name="message_view_attachment_download_action">"Uložit"</string>
-    <string name="message_view_prev_action">"Náhled zprávy"</string>
-    <string name="message_view_next_action">"Další zpráva"</string>
     <string name="message_view_status_attachment_saved">"Příloha byla uložena na SD kartu jako <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved">"Nelze uložit přílohu na SD kartu."</string>
     <string name="message_view_show_pictures_instructions">"Výběrem možnosti Zobrazit obrázky zobrazíte vnořené obrázky."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b4724634e..9fe47dbdc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Verbindungsfehler"</string>
     <string name="status_loading_more_failed">"Laden weiterer Nachrichten erneut versuchen"</string>
     <string name="notification_new_title">"Neue E-Mail"</string>
-    <string name="notification_new_one_account_fmt">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google-Konten"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Posteingang"</string>
     <string name="accounts_welcome">"Willkommen bei der Einrichtung von E-Mails."\n\n"Nutzen Sie ein beliebiges E-Mail-Konto."\n\n"Gängige E-Mail-Konten können in nur zwei Schritten eingerichtet werden."</string>
     <string name="debug_version_fmt">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Öffnen"</string>
     <string name="message_view_attachment_download_action">"Speichern"</string>
-    <string name="message_view_prev_action">"Vorherige Nachricht"</string>
-    <string name="message_view_next_action">"Nächste Nachricht"</string>
     <string name="message_view_status_attachment_saved">"Anhang auf SD-Speicherkarte unter \"<xliff:g id="FILENAME">%s</xliff:g>\" abgespeichert"</string>
     <string name="message_view_status_attachment_not_saved">"Speichern des Anhangs auf SD-Karte nicht möglich"</string>
     <string name="message_view_show_pictures_instructions">"Wählen Sie \"Bilder anzeigen\" aus, um eingebettete Bilder anzuzeigen."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9eedd39cf..2c2c2faab 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Error de conexión"</string>
     <string name="status_loading_more_failed">"Intentar cargar más mensajes"</string>
     <string name="notification_new_title">"Nuevo mensaje"</string>
-    <string name="notification_new_one_account_fmt">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> no leídos (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Recibidos"</string>
     <string name="accounts_welcome">"Te damos la bienvenida a la configuración del correo electrónico."\n\n"Usa cualquier cuenta de correo electrónico con \"Correo electrónico\"."\n\n"Las cuentas de correo electrónico más populares se pueden configurar en 2 pasos."</string>
     <string name="debug_version_fmt">"Versión: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Abrir"</string>
     <string name="message_view_attachment_download_action">"Guardar"</string>
-    <string name="message_view_prev_action">"Mensaje anterior"</string>
-    <string name="message_view_next_action">"Siguiente mensaje"</string>
     <string name="message_view_status_attachment_saved">"El archivo adjunto se ha guardado en una tarjeta SD como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved">"No es posible guardar el archivo adjunto en la tarjeta SD."</string>
     <string name="message_view_show_pictures_instructions">"Selecciona \"Mostrar imágenes\" para visualizar las imágenes incrustadas."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bd7444e23..14d79dc8d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Erreur de connexion"</string>
     <string name="status_loading_more_failed">"Essayer de charger plus de messages"</string>
     <string name="notification_new_title">"Nouvel e-mail"</string>
-    <string name="notification_new_one_account_fmt">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"dans <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Boîte de réception"</string>
     <string name="accounts_welcome">"Bienvenue dans le programme de configuration de votre messagerie électronique !"\n\n"Utilisez le compte de votre choix."\n\n"Les comptes de messagerie les plus courants peuvent être configurés en deux étapes !"</string>
     <string name="debug_version_fmt">"Version : <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Cc :"</string>
     <string name="message_view_attachment_view_action">"Ouvrir"</string>
     <string name="message_view_attachment_download_action">"Enregistrer"</string>
-    <string name="message_view_prev_action">"Message préc."</string>
-    <string name="message_view_next_action">"Message suivant"</string>
     <string name="message_view_status_attachment_saved">"Pièce jointe enregistrée sur la carte SD sous le nom <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved">"Impossible d\'enregistrer la pièce jointe sur la carte SD."</string>
     <string name="message_view_show_pictures_instructions">"Sélectionnez \"Afficher les images\" pour afficher les images intégrées."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 65e1f281d..f83274890 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Errore di connessione"</string>
     <string name="status_loading_more_failed">"Prova nuovamente a caricare altri messaggi"</string>
     <string name="notification_new_title">"Nuova email"</string>
-    <string name="notification_new_one_account_fmt">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> da leggere (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> account"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Posta in arrivo"</string>
     <string name="accounts_welcome">"Benvenuto in Impostazione email."\n\n"Usa qualunque account email con Email."\n\n"Puoi impostare gli account email più popolari in due semplici passaggi."</string>
     <string name="debug_version_fmt">"Versione: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Apri"</string>
     <string name="message_view_attachment_download_action">"Salva"</string>
-    <string name="message_view_prev_action">"Messaggio prec."</string>
-    <string name="message_view_next_action">"Messaggio succ."</string>
     <string name="message_view_status_attachment_saved">"Allegato salvato su scheda SD come <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved">"Impossibile salvare l\'allegato nella scheda SD."</string>
     <string name="message_view_show_pictures_instructions">"Seleziona \"Mostra immagini\" per visualizzare le immagini incorporate."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 42db97232..c0ab1aa72 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"接続エラー"</string>
     <string name="status_loading_more_failed">"追加のメールを読み込み直す"</string>
     <string name="notification_new_title">"新着メール"</string>
-    <string name="notification_new_one_account_fmt">"未読<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"（<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>個のアカウント）"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"受信トレイ"</string>
     <string name="accounts_welcome">"メールアカウントのセットアップ"\n\n"お好きなメールアカウントを登録してください。"\n\n"画面の手順に沿って簡単に追加できます。"</string>
     <string name="debug_version_fmt">"バージョン: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"開く"</string>
     <string name="message_view_attachment_download_action">"保存"</string>
-    <string name="message_view_prev_action">"前のメッセージ"</string>
-    <string name="message_view_next_action">"次のメッセージ"</string>
     <string name="message_view_status_attachment_saved">"「<xliff:g id="FILENAME">%s</xliff:g>」という名前で添付ファイルをSDカードに保存しました。"</string>
     <string name="message_view_status_attachment_not_saved">"添付ファイルをSDカードに保存できません。"</string>
     <string name="message_view_show_pictures_instructions">"埋め込まれている画像を見るには[画像を表示]を選択してください。"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f69a592a6..9bad079a9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"연결 오류"</string>
     <string name="status_loading_more_failed">"추가 메일 로드 재시도"</string>
     <string name="notification_new_title">"새 이메일"</string>
-    <string name="notification_new_one_account_fmt">"읽지않은 메일 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>개(<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"받은편지함"</string>
     <string name="accounts_welcome">"이메일 설정에 오신 것을 환영합니다."\n\n"원하는 이메일 계정을 사용하세요."\n\n"가장 많이 사용하는 이메일 계정은 2단계 만에 설정할 수 있습니다."</string>
     <string name="debug_version_fmt">"버전: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"참조:"</string>
     <string name="message_view_attachment_view_action">"열기"</string>
     <string name="message_view_attachment_download_action">"저장"</string>
-    <string name="message_view_prev_action">"이전 메일"</string>
-    <string name="message_view_next_action">"다음 메일"</string>
     <string name="message_view_status_attachment_saved">"첨부파일(<xliff:g id="FILENAME">%s</xliff:g>)이 SD 카드에 저장되었습니다."</string>
     <string name="message_view_status_attachment_not_saved">"SD 카드에 첨부파일을 저장할 수 없습니다."</string>
     <string name="message_view_show_pictures_instructions">"삽입된 사진을 표시하려면 \'사진 표시\'를 선택하세요."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f86fc7748..ba3e7bd86 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Feil ved tilkobling"</string>
     <string name="status_loading_more_failed">"Prøv på nytt å hente flere meldinger"</string>
     <string name="notification_new_title">"Ny e-post"</string>
-    <string name="notification_new_one_account_fmt">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulest(e) (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontoer"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Innboks"</string>
     <string name="accounts_welcome">"Velkommen til e-post-oppsettet!"\n\n"Du kan bruke hvilken som helst e-postkonto."\n\n"De fleste vanlige e-postkontoer kan settes opp i to trinn!"</string>
     <string name="debug_version_fmt">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Kopi:"</string>
     <string name="message_view_attachment_view_action">"Åpne"</string>
     <string name="message_view_attachment_download_action">"Lagre"</string>
-    <string name="message_view_prev_action">"Forrige melding"</string>
-    <string name="message_view_next_action">"Neste melding"</string>
     <string name="message_view_status_attachment_saved">"Vedlegget ble lagret til minnekortet som <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved">"Kunne ikke lagre vedlegget til minnekort."</string>
     <string name="message_view_show_pictures_instructions">"Velg \"Vis bilder\" for å vise vedlagte bilder."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a308c8205..e76d039fe 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Verbindingsfout"</string>
     <string name="status_loading_more_failed">"Probeer opnieuw meer berichten te laden"</string>
     <string name="notification_new_title">"Nieuwe e-mail"</string>
-    <string name="notification_new_one_account_fmt">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ongelezen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Postvak IN"</string>
     <string name="accounts_welcome">"Welkom bij E-mail instellen."\n\n"Je kunt elke account gebruiken met E-mail."\n\n"De meest populaire e-mailaccounts kunnen in twee stappen worden ingesteld."</string>
     <string name="debug_version_fmt">"Versie: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Cc:"</string>
     <string name="message_view_attachment_view_action">"Openen"</string>
     <string name="message_view_attachment_download_action">"Opslaan"</string>
-    <string name="message_view_prev_action">"Vorig bericht"</string>
-    <string name="message_view_next_action">"Volgend bericht"</string>
     <string name="message_view_status_attachment_saved">"Bijlage opgeslagen op SD-kaart als <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved">"Kan bijlage niet opslaan op SD-kaart."</string>
     <string name="message_view_show_pictures_instructions">"Selecteer Afbeeldingen weergeven om ingevoegde afbeeldingen weer te geven."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0a9a266e2..dfac04fc0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Błąd połączenia"</string>
     <string name="status_loading_more_failed">"Ponów próbę załadowania większej liczby wiadomości"</string>
     <string name="notification_new_title">"Nowa wiadomość e-mail"</string>
-    <string name="notification_new_one_account_fmt">"Nieprzeczytane: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"na <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontach"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Odebrane"</string>
     <string name="accounts_welcome">"Zapraszamy do skonfigurowania poczty e-mail!"\n\n"W tej usłudze można korzystać z dowolnego konta e-mail."\n\n"Konfiguracja najpopularniejszych kont e-mail składa się z tylko 2 etapów."</string>
     <string name="debug_version_fmt">"Wersja: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"DW:"</string>
     <string name="message_view_attachment_view_action">"Otwórz"</string>
     <string name="message_view_attachment_download_action">"Zapisz"</string>
-    <string name="message_view_prev_action">"Poprzednia wiadomość"</string>
-    <string name="message_view_next_action">"Następna wiadomość"</string>
     <string name="message_view_status_attachment_saved">"Załącznik został zapisany na karcie SD jako <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved">"Nie można zapisać załącznika na karcie SD."</string>
     <string name="message_view_show_pictures_instructions">"Wybierz opcję Pokaż obrazy, aby wyświetlić osadzone obrazy."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1539eb72e..f92669cbd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"Ошибка подключения"</string>
     <string name="status_loading_more_failed">"Повторить попытку загрузки остальных писем"</string>
     <string name="notification_new_title">"Новое письмо"</string>
-    <string name="notification_new_one_account_fmt">"Непрочитанных: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"в нескольких (<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>) аккаунтах"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Входящие"</string>
     <string name="accounts_welcome">"Добро пожаловать на страницу настройки электронной почты."\n\n"С нашей почтовой системой можно использовать любой аккаунт электронной почты."\n\n"Самые распространенные аккаунты электронной почты можно настроить за 2 шага."</string>
     <string name="debug_version_fmt">"Версия: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"Копия:"</string>
     <string name="message_view_attachment_view_action">"Открыть"</string>
     <string name="message_view_attachment_download_action">"Сохранить"</string>
-    <string name="message_view_prev_action">"Пред. письмо"</string>
-    <string name="message_view_next_action">"След. письмо"</string>
     <string name="message_view_status_attachment_saved">"Приложение сохранено на SD-карту как <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved">"Не удается сохранить приложение на SD-карту."</string>
     <string name="message_view_show_pictures_instructions">"Выберите \"Показать картинки\", чтобы показать встроенную графику."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fb300c0c1..8b413a0c0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"连接错误"</string>
     <string name="status_loading_more_failed">"重新尝试载入更多邮件"</string>
     <string name="notification_new_title">"新电子邮件"</string>
-    <string name="notification_new_one_account_fmt">"有 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未读邮件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"在 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 个帐户中"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"收件箱"</string>
     <string name="accounts_welcome">"欢迎设置电子邮件！"\n\n"在此可使用任意电子邮件帐户。"\n\n"大多数常见的电子邮件帐户通过 2 步即可完成设置！"</string>
     <string name="debug_version_fmt">"版本：<xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"抄送："</string>
     <string name="message_view_attachment_view_action">"打开"</string>
     <string name="message_view_attachment_download_action">"保存"</string>
-    <string name="message_view_prev_action">"上一封邮件"</string>
-    <string name="message_view_next_action">"下一封邮件"</string>
     <string name="message_view_status_attachment_saved">"附件已保存到 SD 卡中，文件名为 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
     <string name="message_view_status_attachment_not_saved">"无法将附件保存到 SD 卡。"</string>
     <string name="message_view_show_pictures_instructions">"选择“显示图片”可显示嵌入的图片。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8581b9a9b..30abecd74 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -50,8 +50,11 @@
     <string name="status_network_error">"連線錯誤"</string>
     <string name="status_loading_more_failed">"重新載入更多郵件"</string>
     <string name="notification_new_title">"新電子郵件"</string>
-    <string name="notification_new_one_account_fmt">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未讀取的郵件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
-    <string name="notification_new_multi_account_fmt">"在 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 個帳戶中"</string>
+    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
+    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
+    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
+    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"收件匣"</string>
     <string name="accounts_welcome">"歡迎使用 [電子郵件] 設定！"\n\n"[電子郵件] 設定可讓您使用各種電子郵件帳戶！"\n\n"大部分常見的電子郵件只需要兩個步驟就能設定完成！"</string>
     <string name="debug_version_fmt">"版本：<xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -73,8 +76,6 @@
     <string name="message_view_cc_label">"副本："</string>
     <string name="message_view_attachment_view_action">"開啟"</string>
     <string name="message_view_attachment_download_action">"儲存"</string>
-    <string name="message_view_prev_action">"上一封郵件"</string>
-    <string name="message_view_next_action">"下一封郵件"</string>
     <string name="message_view_status_attachment_saved">"已將附件儲存至 SD 記憶卡，檔名為 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
     <string name="message_view_status_attachment_not_saved">"無法將附件儲存至 SD 記憶卡。"</string>
     <string name="message_view_show_pictures_instructions">"選取 [顯示圖片] 即可顯示內嵌的圖片。"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 16f89a777..b749dd018 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -91,10 +91,29 @@
     <string name="status_loading_more_failed">Retry loading more messages</string>
     <!-- Notification title in status bar -->
     <string name="notification_new_title">New email</string>
-    <!-- Notification message in notifications window and one account has new mail; e.g, "279 unread (someone@google.com)" -->
-    <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> unread (<xliff:g id="account">%s</xliff:g>)</string> 
-    <!-- Notification message in notifications window and 2+ accounts has new mail; e.g, "in 3 accounts" -->
-    <string name="notification_new_multi_account_fmt">in <xliff:g id="number_accounts">%d</xliff:g> accounts</string>
+
+    <!-- Notification message in notifications window when one account has
+         one or more new messages; e.g, "279 unread (someone@google.com)". -->
+    <plurals name="notification_new_one_account_fmt">
+        <!-- Case of one new message. -->
+        <item quantity="one"><xliff:g id="unread_message_count" example="1">%d</xliff:g> unread (<xliff:g id="account">%s</xliff:g>)</item> 
+
+        <!-- Case of "few" (small number of) new messages. -->
+        <item quantity="few"><xliff:g id="unread_message_count" example="2">%d</xliff:g> unread (<xliff:g id="account">%s</xliff:g>)</item> 
+
+        <!-- Case of a plural number of new messages. -->
+        <item quantity="other"><xliff:g id="unread_message_count" example="279">%d</xliff:g> unread (<xliff:g id="account">%s</xliff:g>)</item>
+    </plurals>
+
+
+    <!-- Notification message in notifications window when 2+ accounts have new mail; e.g, "in 3 accounts". -->
+    <plurals name="notification_new_multi_account_fmt">
+        <!-- Case of "few" (small number of) accounts with unread messages. -->
+        <item quantity="few">in <xliff:g id="number_accounts" example="2">%d</xliff:g> accounts</item>
+        <!-- Case of plural number of accounts with unread messages. -->
+        <item quantity="other">in <xliff:g id="number_accounts" example="10">%d</xliff:g> accounts</item>
+    </plurals>
+        
 
     <!-- In the folder list view, the inbox will be displayed with this name -->
     <string name="special_mailbox_name_inbox">Inbox</string>
@@ -146,10 +165,6 @@
     <string name="message_view_attachment_view_action">Open</string>
     <!-- Button name -->
     <string name="message_view_attachment_download_action">Save</string>
-    <!-- Button name on read email screen -->
-    <string name="message_view_prev_action">Previous</string>
-    <!-- Button name on read email screen -->
-    <string name="message_view_next_action">Next</string>
     <!-- Toast after saving attachment -->
     <string name="message_view_status_attachment_saved">Attachment saved to SD card as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- Toast after attachment could not be saved-->
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 3c10fceec..2bbc3efcd 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -60,10 +60,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
 import android.view.View.OnClickListener;
-import android.webkit.CacheManager;
-import android.webkit.UrlInterceptHandler;
 import android.webkit.WebView;
-import android.webkit.CacheManager.CacheResult;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -82,7 +79,7 @@ import java.util.Random;
 import java.util.regex.Matcher;
 
 public class MessageView extends Activity
-        implements UrlInterceptHandler, OnClickListener {
+        implements OnClickListener {
     private static final String EXTRA_ACCOUNT = "com.android.email.MessageView_account";
     private static final String EXTRA_FOLDER = "com.android.email.MessageView_folder";
     private static final String EXTRA_MESSAGE = "com.android.email.MessageView_message";
@@ -325,8 +322,6 @@ public class MessageView extends Activity
         findViewById(R.id.delete).setOnClickListener(this);
         findViewById(R.id.show_pictures).setOnClickListener(this);
 
-        // UrlInterceptRegistry.registerHandler(this);
-
         mMessageContentView.getSettings().setBlockNetworkImage(true);
         mMessageContentView.getSettings().setSupportZoom(false);
 
@@ -656,26 +651,6 @@ public class MessageView extends Activity
         return true;
     }
 
-    public CacheResult service(String url, Map<String, String> headers) {
-        String prefix = "http://cid/";
-        if (url.startsWith(prefix)) {
-            try {
-                String contentId = url.substring(prefix.length());
-                final Part part = MimeUtility.findPartByContentId(mMessage, "<" + contentId + ">");
-                if (part != null) {
-                    CacheResult cr = new CacheManager.CacheResult();
-                    // TODO looks fixed in Mainline, cr.setInputStream
-                    // part.getBody().writeTo(cr.getStream());
-                    return cr;
-                }
-            }
-            catch (Exception e) {
-                // TODO
-            }
-        }
-        return null;
-    }
-
     private Bitmap getPreviewIcon(Attachment attachment) {
         try {
             return BitmapFactory.decodeStream(
diff --git a/src/com/android/email/service/MailService.java b/src/com/android/email/service/MailService.java
index 27e3cfd05..b4f6a1046 100644
--- a/src/com/android/email/service/MailService.java
+++ b/src/com/android/email/service/MailService.java
@@ -213,7 +213,9 @@ public class MailService extends Service {
                     Intent i = new Intent(context, Accounts.class);
                     PendingIntent pi = PendingIntent.getActivity(context, 0, i, 0);
                     notif.setLatestEventInfo(context, getString(R.string.notification_new_title),
-                            getString(R.string.notification_new_multi_account_fmt,
+                            getResources().
+                                getQuantityString(R.plurals.notification_new_multi_account_fmt,
+                                    accountsWithNewMail.size(),
                                     accountsWithNewMail.size()), pi);
                 } else {
                     Account account1 = accountsWithNewMail.keySet().iterator().next();
@@ -221,7 +223,9 @@ public class MailService extends Service {
                     Intent i = FolderMessageList.actionHandleAccountIntent(context, account1, Email.INBOX);
                     PendingIntent pi = PendingIntent.getActivity(context, 0, i, 0);
                     notif.setLatestEventInfo(context, getString(R.string.notification_new_title),
-                            getString(R.string.notification_new_one_account_fmt, totalNewMails,
+                            getResources().
+                                getQuantityString(R.plurals.notification_new_one_account_fmt,
+                                    totalNewMails, totalNewMails,
                                     account1.getDescription()), pi);
                     vibrate = account1.isVibrate();
                     ringtone = account1.getRingtone();