From c31c8923c255b635da649acb391498359e0b225c Mon Sep 17 00:00:00 2001
From: Sander Bogaert <Sander.Bogaert@tworoadssoftware.com>
Date: Wed, 22 Aug 2012 09:43:18 -0400
Subject: [PATCH] Add an actionbar to the MessageView activity.

---
 AndroidManifest.xml                           |   2 +-
 res/drawable-hdpi/ic_action_next_message.png  | Bin 0 -> 720 bytes
 .../ic_action_previous_message.png            | Bin 0 -> 685 bytes
 res/drawable-ldpi/ic_action_next_message.png  | Bin 0 -> 333 bytes
 .../ic_action_previous_message.png            | Bin 0 -> 321 bytes
 res/drawable-mdpi/ic_action_next_message.png  | Bin 0 -> 468 bytes
 .../ic_action_previous_message.png            | Bin 0 -> 418 bytes
 res/drawable-xhdpi/ic_action_next_message.png | Bin 0 -> 938 bytes
 .../ic_action_previous_message.png            | Bin 0 -> 840 bytes
 res/layout/message_view.xml                   |   4 -
 res/layout/message_view_bottom_buttons.xml    |  38 ---
 res/layout/message_view_move_buttons.xml      |  33 ---
 res/menu/message_view_option.xml              | 112 +++++----
 res/values/strings.xml                        |   2 +-
 src/com/fsck/k9/activity/MessageView.java     | 232 +++++-------------
 15 files changed, 137 insertions(+), 286 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_action_next_message.png
 create mode 100644 res/drawable-hdpi/ic_action_previous_message.png
 create mode 100644 res/drawable-ldpi/ic_action_next_message.png
 create mode 100644 res/drawable-ldpi/ic_action_previous_message.png
 create mode 100644 res/drawable-mdpi/ic_action_next_message.png
 create mode 100644 res/drawable-mdpi/ic_action_previous_message.png
 create mode 100644 res/drawable-xhdpi/ic_action_next_message.png
 create mode 100644 res/drawable-xhdpi/ic_action_previous_message.png
 delete mode 100644 res/layout/message_view_bottom_buttons.xml
 delete mode 100644 res/layout/message_view_move_buttons.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 862ff25e5..995677ca8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -217,8 +217,8 @@
         </activity>
         <activity
             android:name="com.fsck.k9.activity.MessageView"
-            android:theme="@android:style/Theme.Light"
             android:configChanges="locale"
+            android:uiOptions="splitActionBarWhenNarrow"
             >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
diff --git a/res/drawable-hdpi/ic_action_next_message.png b/res/drawable-hdpi/ic_action_next_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..49f871ec809921da8b35e4df26aef9fc81be5d69
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007)Nkl<ZXhZFo
zyGtWc6vmxoquIs67!xdl1_VI^<^^^ZF1wv<=cCxpMlBS4;r|e^aj~*eP!ZHtVOe(D
z&6AKoihzMd8!=cUpeD@tU2)(tM3`jm&CZ1h3^NmMW`5sy&YYY%QitFlNpSuSOThn*
zpcMft0tOwhQm9!21A#!d!{HdoWHRw)f7@t%TO$ySMje1yQ50nu`^!`+b%DKNL`XXY
zNTE<@-e$9ntH81>|E*Lihs9#?sZ|ke6A+0+rU3a(1A0@h*SE9TY}M2P06zi1@7QR=
z9*|10bUJ<4Dm?ie_Xvc;;ZaGFmT<353iJui@4)$MBk<e>pyKp9oz5*d{fPpValQ}d
z6Gq{=3cv%~1Lrrf_0gb!KLz|x7Vz8z`2BvT%jH@D{E!Cz7vN7=!SfOzq24dR=`aln
zG5KUNxr^^)Qwu=qOrzF+)j*cY<?>FcRC;6y&pZNfeiF{l(bWyk-&d>E?Lwh&&l;Yo
z0Mz<1z>?JYpn~H35z&an<MDqy;F$@4^8*0izy-S~_&NmaB@&4oFL)*b08h%~It27m
zpbGk&V|1LqdBPhO;Pd%DdcEFNTxd{JF0W87&v?T#5#aH7){rU#8d%aQpPOC)0emlo
zkWxp8!XMrum^5=jKg6oT=sJTanWT)`g)5^fF#ZcZ<9JrcKQc<h4358Oa$k&A;tl$}
zW-f<j?g!SGyO|>*NIUIzyUFxH$aeZQ5JJDusQEASE2SzT7z_sNcKagE#e1ozDwDWl
z6-q>-!PYItD>2g#w$$?4XtY?X)eiFc{Bx^46O&#@@6GX0cVbSoEb4IgRj1J7b-j^l
zW?frTs2MQ5Yb^nKo#M65iU2QX^<LMCfL^C~t$P7}StUS6mRRTj0000<MNUMnLSTZZ
C(NEt1

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_action_previous_message.png b/res/drawable-hdpi/ic_action_previous_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4a8f955f4c912941adce9a509892baa634ed3f4
GIT binary patch
literal 685
zcmV;e0#f~nP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007XNkl<ZXhZFo
z&1)J#7{*=EM$ki1a%l+|@E|DSXRn3QkX%DZ34!#KQ%NsH|A*3#LwiVb$t{P5+(K@J
z<d9py4+16-D2R9ns3nJxY?Zow2G%kxwyrxfmKRnKc4Wr)`Mu9OA3K_d_(vnI-{S)O
zZwFlmTn7X*;Fi!Zf$4O*(C_yz>-GArU{WU<F2eyWo6RmG>XN2uSGul$21IWn6#|`w
z01}DB1Ha$@((Cm;8EO~|24}TeZ5M4rK$q>ILI9~$D(Lh1N{IHz67jH7sT|o>A<$6>
zfW^&ZGP5Wh2Jw*7!Lq*xh*JS=wuTA=uqbe19!|W$;|v$IXBftIwOYNfrNm(;DFCJu
zc{s6&XYWu8+IN`LZ!xK_9qJo9Od0@-gr#%=6MB`83Ku%~zQe@68LP%Y2dMz26Klx)
zGhPeY-@D!Jr$(cpJJ9&gA<_X@3FUIR*T{Op0#PlO%RBf@>hh`rz!Qx|1L1I(P3kBQ
zfj#0IO6fqR3rYZ(z<4|!2?m2jI1%9l8z`r*aN<N3gfajouuv$>A?qbT1h|#y7usL2
zN1V%mPzt~V=JWX^1i!-9#|i!kC*H$}rYMAR0CQz}3c>4m{u2-FA83C7L`MW-DgY+L
z3Pdkj_K0S?-Tv5WweFolxBzxChXWto5+Xf`NiU;++sIII``81H?UbIKK1wDr^`itk
z%xz)gN|HRxVa1_)oQC-4*sNYyHY*x0G!Resm6G&JJ?U!|^J1%rntyCrvuRvx#bU9U
zP$;xP_G;10I^D}%zHBI8uiH7YDC?u-ETl~Bh(C4#rkU+gv0MjS2Lv-fzJz`QZQ3S4
T^!Vti00000NkvXXu0mjf<{2=p

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/ic_action_next_message.png b/res/drawable-ldpi/ic_action_next_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d2d9e708dff3e6516bc966d3b237e2cd3f95995
GIT binary patch
literal 333
zcmV-T0kZyyP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003LNkl<ZNK0d6
zpfO;ivH1)m*8)Z(Bcnh@M#e*D&z^mQFPO;+BB0?xKtnx%_|>^{=Nf?YA6%A@Y=N<{
zvE%>$|0970{sZD^KnpHW%?E~thFVNaOu0Y{nE(CzxB9|`3%d!WLZW@3r>7^w%F0>-
zG@J_<_6LArzl@OKAbFxJ(AL%#VrOSB2dWnY8h##V_zWQXKUFMHQBh&%<>f5{8Y~NR
z{iDyHKX>1`bLS^9h7;ohCSasy01Y+(TJY}2j~`uEuU>setl=bE@axyF&dZlCzo(`J
z473g+uw!W&$*|y{X)=XbqOY&7&BDTxLz9dKvxKHa1<Vqf7IsieXj@!UH6M^-7&f&;
f6?T+ZLURiM3EPSpLO%*{00000NkvXXu0mjfaps9h

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/ic_action_previous_message.png b/res/drawable-ldpi/ic_action_previous_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..159cb68d6b915f7caf380292d21ef6ad563ba8bd
GIT binary patch
literal 321
zcmV-H0lxl;P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00039Nkl<ZNK0d6
zpfO;ivH1)mzyf1qW0C*=|J$8AcWyl}IRBFxq=bTq#mLC00cfZg5bpq5vX0soFaRyk
z0~(qI#7vBgjLXlSJ-eS2O9=S@Y?gt6fh!XeQz+1azyJRIn|%KK`D?^lLX-s{!+>!S
z1&j*^pe5ga|Nh-`>C&Yq#8^VK1wg|XftF+dEinYL-~asiv-9fJtM3R|LW%_pDk>`M
zyu7@nKwroKEqeU<^XINRckcYeX9-CbfDF>s))wO6;3xxHAOy7N0x;5N0EPeIvV>#{
zbaizF+1S|1X<`AbgNU|~Ow(ja(~L&zqJs8?9j%LNLL~t~d6F|4K@-sw41Eg#%7l;^
TPlNhi00000NkvXXu0mjf<aCRh

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_action_next_message.png b/res/drawable-mdpi/ic_action_next_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..d80d0e11272a1598ef0cb61ba192e63e8099a80a
GIT binary patch
literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004-Nkl<ZSVv=I
z7+}CS!1gnYI$(H(fT^je?CH~|ACr=<s1^c-hK44LjEt%O|Nq~8{`~p1Ku7#1#vxR3
zfU&W$GSK28poOd;OPQFMCY?ER<_cXL0Q9*i(C3vv%XmN*0v)mo7y@gEu^gm^q7cy2
z)8l4kWvu{ODh@V`k@4Kwvu9@#8~l_yfW^qjs1Rs~D%A4(K)MI$fZxRWo+1YTgFYGP
zV{>S*zv1HIYCn4P=x0(aC))uA1_u7Xgys$P`L`cGeso;Ddi4dVmXqZGpygIT%M+lM
z|M~s<_ryz=F5M)@a*`dOtE;QQ#>SQpOmxhU1pj{lFvTAy*K(2^0E}}fpwG*ImU2Pk
zeGAa?O_W$pjswbp4&WRR2Y@UEW;;z_%FlyE0Z?fExpU`EP!b9x7epo|Cf5J{{fi%v
zL<sZgfM!D^N2CA~r5UUs`u6Qx`^}p-=~ECv9f4640}G^HV1e|Dlr%wd8bCIDperM=
zTL!c`hK0s}Hb`KO7|<pe%n<|HC?zH3Bdet-7m#b|r~?L72mk<W{lX!zF>*lw0000<
KMNUMnLSTaX?9Yn;

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_action_previous_message.png b/res/drawable-mdpi/ic_action_previous_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..498f7f4d2cf9e784ea0da4fa6d118785e0aa3ea4
GIT binary patch
literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004LNkl<ZSVv=I
z7+}CS!1gnYI$-F9fT^je?CH~|A5$yskP-rnhK7d0jEsz~|NsA=eg6FUGt_Vd(GD;%
zG12+=?_VC&(%(Rb^qoC>_AaH4Ald;Si+~{z0<_o-YUvkXNVEe(;x#3XAjtthix`cK
zjnjb^8-XkZI_Bl?-@iL9UApv@Tt|@V00wPsZ8i=Lj$)uA6rq;hK6mb1Kal;097mAs
z0FWit*4Dh=zJ03%hJXl&4@?`UE?l@Uhi(o4Sp*CT31CQ607HTc>WHmCM{Fe35oCn`
z%o064J#|)A)_kBNSfGwr0CdDLQXD~%1E4v>5*QT;kTl8o_t&pq6E9!Be1lj=Q0xGx
zBm97t`#^KXH(;9R0%p%=#5iK;I{;WX4O|oqXd)cYY^biT&dbHcH82Gcur6Q)rtXq~
zDvAfTG8)k8crY|b2DV8CD^>@xQA$kFPO=)R)CDBlilkxG0RtWa08UcLA-Zz{zW@LL
M07*qoM6N<$g8z`Jt^fc4

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_action_next_message.png b/res/drawable-xhdpi/ic_action_next_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..039afc39eae44fb3e6e75a6fbe5a26c760d71d8e
GIT binary patch
literal 938
zcmV;b16BNqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000AVNkl<ZcwX(A
zyNeT17{xP_7$dBST4*8K7z9ns(@IcN`Ko+%+FH4atA*}g;8xj<g=izFpn`&8p@rfG
z)I!NSxP>l?ouGwbafQ6bb0q^|xwFG&=RTM_X*N5_Waf9i$NA>YXg<YXn&SLEPXI3i
z6j#720mT!*Yl2=0cqO2?0@9X1DwWz72n4iJsq~&@jHDDGlgaGTH0`2c7=HYHQ7)IC
zLxesHA*2%^nM`g)<Szq$y$Ou>AF9>rUHsp5S_G*C$Y!$<08RpU69sgxQmGWM-EdL_
zX#|KyqiZ9P$OXXfqyeH7?x7UkISEgGOBMn2bUJ+=kb5iuUn2TXoraf20HpqLME)2J
zu;1^0tkr6FT-yZE^bYy`{?iuGok!&JESjHrJfS6kwBN1kI;ngAQUOp7KYG1h9?}2J
zBK3s}fVAI%lOSHdjsm}c)SrU&{bUI*tOsDq+knVV;siEQ0NW7dCgA5-!wV507K@Dq
zgTYHk@$D2q1KV%I?kYUsMF>FbZXA$t3$G_*?=xQT+y%gle+CCVXaQdY`~#lwTm=C9
z5ghQO1>hIh-84(Pvl5nz4I=ILBJI!NBxuL`-tBg08jZ#u-qGih0f>AQ@Wkt>c88O=
zj@17p0-m`5i9}*EE^V*jKw}iI|J!c23(aQpt0;J;0u1bK0@2?_vpY<Ax9atJRU|w!
z0dl!qpw((!0X&)Zmc9&3c~3Cnz7h@3N&szOcL!*I=moQw@*c_n&rASx{j-SvehUHK
zK!8VX7QlxKoizX?>w44@!1l)w;k67RFq;EN6AXny6M$8(37V0O$KzXY;d9l(1{XV>
zP5}eZH<6jZECWoa!5~Dg`$LpjV8PXckO^!z3Zr38V;Wo(kqOK*U`T|c06js2#P-h+
zU<RK#e&fSVRBi&`M3$WoutGG8`+(f%1D*nqVCb;Oar6T<7et5xcGn1QUlRLYl1eX%
znoUXRW$__rQ1`~j(4ce}?@w9S)qFS{&KHYCX7<S21*n`#-y9t%qW0}^B7)rm68Oq}
zES<l#o9tHlxfCTZ<P4UN$Y4JBgmL)>zU$6MWK0p1en@J_8Pt7D&J;oE2PIe9$X4@x
zshZ$wKt|oy6JS*3+_ImS0d9%ps2pAfjH;Yl_VY5pEs-3RL-`E&2eznVQ2F@gKL7v#
M07*qoM6N<$g5EQ)=>Px#

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_action_previous_message.png b/res/drawable-xhdpi/ic_action_previous_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..16443bba768d0ade65d9878f147fdcb0fd6de66b
GIT binary patch
literal 840
zcmV-O1GoH%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0009INkl<ZcwX(A
zyNeT16vk&J6Ty`b3kADHP>U7vRtr~%f}j?nVxfWxS|}Fox|RL~Yoo$GDqAfTE72|}
zSed6rL6T~*u}~8ij3JxxyUVP_dauHg`(V!9W`+sb$@e?ox#!%6>k$8QiR*VP0P6ta
z1Z)ZrH-H@kZ3@^FAWlGf3KR;3gM+~!sMTt3Ok^z+fS1qbPX<A7!gbvhT<0p4%16^6
z$O7PJv)RiKeqc>7?tj1u_v`igXOkev0N^6>Hxco@>xBZsS3H|7m&+YfAjkmV<Z`(~
z5O|R%5)eLhI-U7etM$tS2vPtrVSsQ3mt#DUaL2o9wYrGUhPok00{~%OCX>19dEP#O
z6P_a#o<$jeQ!Ez!ZnrxFk-G#!pP(|l)CobR16Fmx1zTgW*bHpHgEJ_u42Q#cq{9bY
z5TpZO!cY>oBNc7~LV^R~C!WnA9ojk|C;<>cm_P-%f%{Dyq2J(yS#*ovRYOn)fC)o?
zkb?`Z;r6fh;`vg)-+$0-HkVaGPzoS~aEi6Zg39n7sj#53JSqneLbw13MM0!rp)x$i
zXMqYQXaN9WJ{qN4xb7B+d<qCJq71-ErBYjb-=BuaagI<JBzTDO_*OOqT@F~)g+Xx}
zE_Vdwu@_FETQVVN1;B*C2|MHQ_%y_B<_KNJ6#8zX(fA?@f_4B*SUR1~qFcPqE05?M
zmU_LOwDM>K00sdq^HFq*X9Yb%JDE)0E0s!vQ9HpH08AKK=5vVn5uQk-$ZHIWk49Y{
zEr3y5YNP+}Unu}rv=fO$bW?!zAQ+axDdhMVxiUz)5rX(JM4inCNVdX00I=?F56Q_8
z_6yHr1?aFqe6**-h&<f|5z<RyXmjZ<ijrOyr@k@rzqP+eZ;i3d(JPqa@8^{}OmL#T
zIf_-^(-3}KFt?BP_BhJjB)Ysyg2+eyfP{<aPeJ^|dH`gO$Ur#hLsDyjCw)xrkNYVf
zl-%g@pwjOdwJNMsdH6C5KnHb`-f10RQZ#h@7V7{V)J=M)b%06H(D7TyJK#5+j*3v>
Sn!w=z0000<MNUMnLSTXuy>q4j

literal 0
HcmV?d00001

diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 7bf2fb51c..29cb23973 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -7,8 +7,4 @@
 
     <include layout="@layout/message"/>
 
-    <include layout="@layout/message_view_move_buttons"/>
-
-    <include layout="@layout/message_view_bottom_buttons"/>
-
 </LinearLayout>
diff --git a/res/layout/message_view_bottom_buttons.xml b/res/layout/message_view_bottom_buttons.xml
deleted file mode 100644
index 28bd9ea9b..000000000
--- a/res/layout/message_view_bottom_buttons.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
-        android:id="@+id/bottom_buttons"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingRight="6dip"
-        android:background="@android:color/transparent"
-        android:gravity="center_vertical">
-        <Button
-            android:id="@+id/previous"
-            android:text="@string/message_view_prev_action"
-            android:contentDescription="@string/previous_action"
-            android:textSize="35dip"
-            android:padding="0dip"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-
-        <ImageButton
-            android:id="@+id/delete"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_button_delete"
-            android:textSize="0dip"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-       <Button
-            android:id="@+id/next"
-            android:text="@string/message_view_next_action"
-            android:contentDescription="@string/next_action"
-            android:textSize="35dip"
-            android:padding="0dip"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-    </LinearLayout>
-</merge>
diff --git a/res/layout/message_view_move_buttons.xml b/res/layout/message_view_move_buttons.xml
deleted file mode 100644
index 21af3210a..000000000
--- a/res/layout/message_view_move_buttons.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout
-        android:id="@+id/move_buttons"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingRight="6dip"
-        android:background="@android:color/transparent"
-        android:gravity="center_vertical">
-        <Button
-            android:id="@+id/archive"
-            android:text="@string/message_view_archive_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/move"
-            android:text="@string/message_view_move_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-
-        <Button
-            android:id="@+id/spam"
-            android:text="@string/message_view_spam_action"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-    </LinearLayout>
-
-
-</merge>
diff --git a/res/menu/message_view_option.xml b/res/menu/message_view_option.xml
index fe1364847..b64200fdd 100644
--- a/res/menu/message_view_option.xml
+++ b/res/menu/message_view_option.xml
@@ -1,68 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/reply"
-        android:alphabeticShortcut="r"
-        android:title="@string/reply_action"
-        android:icon="@drawable/ic_menu_reply"
+        android:id="@+id/next_message"
+        android:title="@string/next_action"
+        android:icon="@drawable/ic_action_next_message"
+        android:showAsAction="always"
     />
     <item
-        android:id="@+id/reply_all"
-        android:alphabeticShortcut="a"
-        android:title="@string/reply_all_action"
-        android:icon="@drawable/ic_menu_reply_all"
-    />
-    <item
-        android:id="@+id/forward"
-        android:alphabeticShortcut="f"
-        android:title="@string/forward_action"
-        android:icon="@drawable/ic_menu_forward_mail"
-    />
-    <item
-        android:id="@+id/mark_as_unread"
-        android:alphabeticShortcut="u"
-        android:title="@string/mark_as_unread_action"
-        android:icon="@drawable/ic_menu_mark"
+        android:id="@+id/previous_message"
+        android:title="@string/previous_action"
+        android:icon="@drawable/ic_action_previous_message"
+        android:showAsAction="always"
     />
     <item
         android:id="@+id/delete"
         android:alphabeticShortcut="q"
         android:title="@string/delete_action"
-        android:icon="@drawable/ic_menu_delete"
+        android:icon="@drawable/ic_action_delete"
+        android:showAsAction="always"
     />
     <item
-        android:id="@+id/show_full_header"
-        android:title="@string/show_full_header_action"
+        android:id="@+id/single_message_options"
+        android:icon="@drawable/ic_action_single_message_options"
+        android:showAsAction="ifRoom"
+        android:title="@string/single_message_options_action">
+        <menu>
+            <item
+                android:id="@+id/reply"
+                android:title="@string/reply_action"/>
+            <item
+                android:id="@+id/reply_all"
+                android:title="@string/reply_all_action"/>
+            <item
+                android:id="@+id/forward"
+                android:title="@string/forward_action"/>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/archive"
+        android:title="@string/archive_action"
+        android:icon="@drawable/ic_action_archive"
+        android:showAsAction="ifRoom"
+    />
+    <item
+        android:id="@+id/spam"
+        android:title="@string/spam_action"
+        android:icon="@drawable/ic_action_spam"
+        android:showAsAction="ifRoom"
+    />
+    <item
+		android:id="@+id/move_or_copy"
+	    android:title="@string/move_or_copy_action"
+	    android:showAsAction="ifRoom"
+	    android:icon="@drawable/ic_action_move_or_copy">
+	    <menu>
+		    <item
+		        android:id="@+id/move"
+		        android:title="@string/move_action"
+		    />
+		    <item
+		        android:id="@+id/copy"
+		        android:title="@string/copy_action"
+		    />
+		</menu>
+	</item>
+	<item
+        android:id="@+id/toggle_unread"
+        android:alphabeticShortcut="u"
+        android:title="@string/read_toggle_action"
+        android:icon="@drawable/ic_action_toggle_read"
+        android:showAsAction="never"
     />
     <item
         android:id="@+id/flag"
         android:alphabeticShortcut="s"
         android:title="@string/flag_action"
-        android:icon="@drawable/ic_menu_forward_mail"
-    />
-    <item
-        android:id="@+id/send_alternate"
-        android:title="@string/send_alternate_action"
-        android:icon="@drawable/ic_menu_forward_mail"
-    />
-    <item
-        android:id="@+id/archive"
-        android:title="@string/archive_action"
-    />
-    <item
-        android:id="@+id/spam"
-        android:title="@string/spam_action"
-    />
-    <item
-        android:id="@+id/move"
-        android:title="@string/move_action"
-    />
-    <item
-        android:id="@+id/copy"
-        android:title="@string/copy_action"
+        android:showAsAction="never"
     />
 	<item
 		android:id="@+id/select_text"
 		android:title="@string/select_text_action"
+		android:showAsAction="never"
 	/>
+	<item
+        android:id="@+id/share"
+        android:showAsAction="never"
+        android:title="@string/send_alternate_action"
+    />
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 57c0de8a0..cfec22e87 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -146,7 +146,7 @@ http://k9mail.googlecode.com/
 
     <string name="accounts_action">Accounts</string>
     <string name="mark_as_read_action">Mark as read</string>
-    <string name="read_toggle_action">(un)read</string>
+    <string name="read_toggle_action">Toggle (un)read</string>
     <string name="send_alternate_action">Share</string>
     <string name="send_alternate_chooser_title">Choose sender</string>
 
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 05d9be699..ecd049b89 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -45,7 +45,6 @@ import com.fsck.k9.view.SingleMessageView;
 public class MessageView extends K9Activity implements OnClickListener {
     private static final String EXTRA_MESSAGE_REFERENCE = "com.fsck.k9.MessageView_messageReference";
     private static final String EXTRA_MESSAGE_REFERENCES = "com.fsck.k9.MessageView_messageReferences";
-    private static final String EXTRA_NEXT = "com.fsck.k9.MessageView_next";
     private static final String EXTRA_MESSAGE_LIST_EXTRAS = "com.fsck.k9.MessageView_messageListExtras";
     private static final String STATE_PGP_DATA = "pgpData";
     private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
@@ -55,13 +54,7 @@ public class MessageView extends K9Activity implements OnClickListener {
     private SingleMessageView mMessageView;
 
     private PgpData mPgpData;
-
-    private View mNext;
-    private View mPrevious;
-    private View mDelete;
-    private View mArchive;
-    private View mMove;
-    private View mSpam;
+    private Menu mMenu;
     private Account mAccount;
     private MessageReference mMessageReference;
     private ArrayList<MessageReference> mMessageReferences;
@@ -399,51 +392,14 @@ public class MessageView extends K9Activity implements OnClickListener {
         }
 
         mAccount = Preferences.getPreferences(this).getAccount(mMessageReference.accountUuid);
-
-
-        if (K9.DEBUG)
-            Log.d(K9.LOG_TAG, "MessageView got message " + mMessageReference);
-        if (intent.getBooleanExtra(EXTRA_NEXT, false)) {
-            mNext.requestFocus();
-        }
-
         mScreenWidthInPixels = getResources().getDisplayMetrics().widthPixels;
 
         // Enable gesture detection for MessageViews
         mGestureDetector = new GestureDetector(new MyGestureDetector(false));
 
-        setupButtonViews();
         displayMessage(mMessageReference);
     }
 
-    private void setupButtonViews() {
-        setOnClickListener(R.id.from);
-        setOnClickListener(R.id.reply);
-        setOnClickListener(R.id.reply_all);
-        setOnClickListener(R.id.delete);
-        setOnClickListener(R.id.forward);
-        setOnClickListener(R.id.next);
-        setOnClickListener(R.id.previous);
-        setOnClickListener(R.id.archive);
-        setOnClickListener(R.id.move);
-        setOnClickListener(R.id.spam);
-        setOnClickListener(R.id.download_remainder);
-
-
-        mNext = findViewById(R.id.next);
-        mPrevious = findViewById(R.id.previous);
-        mDelete = findViewById(R.id.delete);
-
-        mArchive = findViewById(R.id.archive);
-        mMove = findViewById(R.id.move);
-        mSpam = findViewById(R.id.spam);
-
-        if (!mAccount.getEnableMoveButtons()) {
-            View buttons = findViewById(R.id.move_buttons);
-            buttons.setVisibility(View.GONE);
-        }
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -473,46 +429,7 @@ public class MessageView extends K9Activity implements OnClickListener {
         mMessageView.resetHeaderView();
 
         mController.loadMessageForView(mAccount, mMessageReference.folderName, mMessageReference.uid, mListener);
-        setupDisplayMessageButtons();
-    }
-
-    private void setupDisplayMessageButtons() {
-        mDelete.setEnabled(true);
-        mNext.setEnabled(mNextMessage != null);
-        mPrevious.setEnabled(mPreviousMessage != null);
-        // If moving isn't support at all, then all of them must be disabled anyway.
-        if (mController.isMoveCapable(mAccount)) {
-            // Only enable the button if they have an archive folder and it's not the current folder.
-            mArchive.setEnabled(!mMessageReference.folderName.equals(mAccount.getArchiveFolderName()) &&
-                                mAccount.hasArchiveFolder());
-            // Only enable the button if the Spam folder is not the current folder and not NONE.
-            mSpam.setEnabled(!mMessageReference.folderName.equals(mAccount.getSpamFolderName()) &&
-                             mAccount.hasSpamFolder());
-            mMove.setEnabled(true);
-        } else {
-            disableMoveButtons();
-        }
-    }
-
-    private void disableButtons() {
-        mMessageView.setLoadPictures(false);
-        disableMoveButtons();
-        mNext.setEnabled(false);
-        mPrevious.setEnabled(false);
-        mDelete.setEnabled(false);
-    }
-
-    private void disableMoveButtons() {
-        mArchive.setEnabled(false);
-        mMove.setEnabled(false);
-        mSpam.setEnabled(false);
-    }
-
-    private void setOnClickListener(int viewCode) {
-        View thisView = findViewById(viewCode);
-        if (thisView != null) {
-            thisView.setOnClickListener(this);
-        }
+        configureMenu(mMenu);
     }
 
     private void findSurroundingMessagesUid() {
@@ -563,7 +480,7 @@ public class MessageView extends K9Activity implements OnClickListener {
         if (mMessage != null) {
             // Disable the delete button after it's tapped (to try to prevent
             // accidental clicks)
-            disableButtons();
+            mMenu.findItem(R.id.delete).setEnabled(false);
             Message messageToDelete = mMessage;
             showNextMessageOrReturn();
             mController.deleteMessages(new Message[] {messageToDelete}, null);
@@ -771,12 +688,11 @@ public class MessageView extends K9Activity implements OnClickListener {
             return;
         }
         mLastDirection = NEXT;
-        disableButtons();
+        //toggleActionsState(mMenu, false);
         if (K9.showAnimations()) {
             mMessageView.startAnimation(outToLeftAnimation());
         }
         displayMessage(mNextMessage);
-        mNext.requestFocus();
     }
 
     protected void onPrevious() {
@@ -786,12 +702,11 @@ public class MessageView extends K9Activity implements OnClickListener {
             return;
         }
         mLastDirection = PREVIOUS;
-        disableButtons();
+        //toggleActionsState(mMenu, false);
         if (K9.showAnimations()) {
             mMessageView.startAnimation(inFromRightAnimation());
         }
         displayMessage(mPreviousMessage);
-        mPrevious.requestFocus();
     }
 
     private void onToggleRead() {
@@ -815,33 +730,6 @@ public class MessageView extends K9Activity implements OnClickListener {
 
     public void onClick(View view) {
         switch (view.getId()) {
-        case R.id.reply:
-            onReply();
-            break;
-        case R.id.reply_all:
-            onReplyAll();
-            break;
-        case R.id.delete:
-            onDelete();
-            break;
-        case R.id.forward:
-            onForward();
-            break;
-        case R.id.archive:
-            onRefile(mAccount.getArchiveFolderName());
-            break;
-        case R.id.spam:
-            onRefile(mAccount.getSpamFolderName());
-            break;
-        case R.id.move:
-            onMove();
-            break;
-        case R.id.next:
-            onNext();
-            break;
-        case R.id.previous:
-            onPrevious();
-            break;
         case R.id.download:
             ((AttachmentView)view).saveFile();
             break;
@@ -857,6 +745,12 @@ public class MessageView extends K9Activity implements OnClickListener {
         case android.R.id.home:
             finish();
             break;
+        case R.id.next_message:
+		onNext();
+		break;
+        case R.id.previous_message:
+		onPrevious();
+		break;
         case R.id.delete:
             onDelete();
             break;
@@ -869,15 +763,15 @@ public class MessageView extends K9Activity implements OnClickListener {
         case R.id.forward:
             onForward();
             break;
-        case R.id.send_alternate:
-            onSendAlternate();
-            break;
-        case R.id.mark_as_unread:
-            onToggleRead();
-            break;
         case R.id.flag:
             onFlag();
             break;
+        case R.id.share:
+            onSendAlternate();
+            break;
+        case R.id.toggle_unread:
+            onToggleRead();
+            break;
         case R.id.archive:
             onRefile(mAccount.getArchiveFolderName());
             break;
@@ -890,14 +784,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         case R.id.copy:
             onCopy();
             break;
-        case R.id.show_full_header:
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    mMessageView.showAllHeaders();
-                }
-            });
-            break;
         case R.id.select_text:
             mMessageView.beginSelectingText();
             break;
@@ -911,21 +797,61 @@ public class MessageView extends K9Activity implements OnClickListener {
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         getSupportMenuInflater().inflate(R.menu.message_view_option, menu);
-        if (!mController.isCopyCapable(mAccount)) {
-            menu.findItem(R.id.copy).setVisible(false);
-        }
-        if (!mController.isMoveCapable(mAccount)) {
+        mMenu = menu;
+        configureMenu(menu);
+        return true;
+    }
+
+    private void configureMenu(Menu menu){
+	// first run displayMessage() gets called before onCreateOptionMenu()
+	if (menu == null) {
+		return;
+	}
+
+	// enable them all
+	menu.findItem(R.id.copy).setVisible(true);
+	menu.findItem(R.id.move).setVisible(true);
+	menu.findItem(R.id.archive).setVisible(true);
+	menu.findItem(R.id.spam).setVisible(true);
+        toggleActionsState(menu, true);
+
+	menu.findItem(R.id.next_message).setVisible(mNextMessage != null);
+	menu.findItem(R.id.previous_message).setVisible(mPreviousMessage != null);
+
+        // comply with the setting
+        if (!mAccount.getEnableMoveButtons()) {
             menu.findItem(R.id.move).setVisible(false);
             menu.findItem(R.id.archive).setVisible(false);
             menu.findItem(R.id.spam).setVisible(false);
+        } else {
+		// check message, folder capability
+            if (!mController.isCopyCapable(mAccount)) {
+                menu.findItem(R.id.copy).setVisible(false);
+            }
+
+            if (mController.isMoveCapable(mAccount)) {
+                menu.findItem(R.id.move).setVisible(true);
+
+                menu.findItem(R.id.archive).setVisible(
+				!mMessageReference.folderName.equals(mAccount.getArchiveFolderName())
+				&& mAccount.hasArchiveFolder());
+
+                menu.findItem(R.id.spam).setVisible(
+				!mMessageReference.folderName.equals(mAccount.getSpamFolderName())
+				&& mAccount.hasSpamFolder());
+            } else {
+		menu.findItem(R.id.copy).setVisible(false);
+		menu.findItem(R.id.move).setVisible(false);
+		menu.findItem(R.id.archive).setVisible(false);
+		menu.findItem(R.id.spam).setVisible(false);
+            }
         }
-        if (!mAccount.hasArchiveFolder()) {
-            menu.findItem(R.id.archive).setVisible(false);
-        }
-        if (!mAccount.hasSpamFolder()) {
-            menu.findItem(R.id.spam).setVisible(false);
-        }
-        return true;
+    }
+
+    private void toggleActionsState(Menu menu, boolean state){
+	for(int i=0; i<menu.size(); ++i) {
+		menu.getItem(i).setEnabled(state);
+	}
     }
 
     // TODO: when switching to API version 8, override onCreateDialog(int, Bundle)
@@ -972,28 +898,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         return super.onCreateDialog(id);
     }
 
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (menu != null) {
-            MenuItem flagItem = menu.findItem(R.id.flag);
-            if (flagItem != null && mMessage != null) {
-                flagItem.setTitle((mMessage.isSet(Flag.FLAGGED) ? R.string.unflag_action : R.string.flag_action));
-            }
-            MenuItem additionalHeadersItem = menu.findItem(R.id.show_full_header);
-            if (additionalHeadersItem != null) {
-                additionalHeadersItem.setTitle(mMessageView.additionalHeadersVisible() ?
-                                               R.string.hide_full_header_action : R.string.show_full_header_action);
-            }
-
-            if (mMessage != null) {
-                int actionTitle = mMessage.isSet(Flag.SEEN) ?
-                        R.string.mark_as_unread_action : R.string.mark_as_read_action;
-                menu.findItem(R.id.mark_as_unread).setTitle(actionTitle);
-            }
-        }
-        return super.onPrepareOptionsMenu(menu);
-    }
-
     class Listener extends MessagingListener {
         @Override
         public void loadMessageForViewHeadersAvailable(final Account account, String folder, String uid,