From 94331c96d9397ec451ae3a0a9f825cc4aca2b9d1 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Wed, 11 May 2011 11:38:54 -0700
Subject: [PATCH] Remove phone activities and implement one-pane

The primary purpose of this CL is to remove phone activities, so the
one pane implementation is very much temporary and primitive, but it
should offer minimal operations.

Change-Id: If57f81db7c605c95664d49044a5cc082beda59c0
---
 .../appointment_indicator_leftside_1.9.png    | Bin 443 -> 0 bytes
 res/drawable-hdpi/btn_folder.png              | Bin 1100 -> 0 bytes
 res/drawable-hdpi/ic_calendar_event_small.png | Bin 1037 -> 0 bytes
 res/drawable-hdpi/ic_list_folder.png          | Bin 916 -> 0 bytes
 res/drawable-hdpi/ic_menu_account_list.png    | Bin 3662 -> 0 bytes
 res/drawable-hdpi/ic_menu_compose.png         | Bin 2993 -> 0 bytes
 res/drawable-hdpi/ic_menu_folder.png          | Bin 1519 -> 0 bytes
 res/drawable-hdpi/ic_menu_forward_mail.png    | Bin 2187 -> 0 bytes
 res/drawable-hdpi/ic_menu_refresh.png         | Bin 4174 -> 0 bytes
 res/drawable-hdpi/ic_menu_reply.png           | Bin 2791 -> 0 bytes
 res/drawable-hdpi/ic_menu_reply_all.png       | Bin 2987 -> 0 bytes
 res/drawable-hdpi/ic_mms_attachment_small.png | Bin 1905 -> 0 bytes
 res/drawable-hdpi/ind_default.png             | Bin 381 -> 0 bytes
 res/drawable-hdpi/ind_sum.9.png               | Bin 1030 -> 0 bytes
 res/drawable-hdpi/ind_unread.9.png            | Bin 1089 -> 0 bytes
 .../appointment_indicator_leftside_1.9.png    | Bin 331 -> 0 bytes
 res/drawable-mdpi/btn_folder.png              | Bin 723 -> 0 bytes
 res/drawable-mdpi/ic_calendar_event_small.png | Bin 797 -> 0 bytes
 res/drawable-mdpi/ic_list_folder.png          | Bin 634 -> 0 bytes
 res/drawable-mdpi/ic_menu_account_list.png    | Bin 2394 -> 0 bytes
 res/drawable-mdpi/ic_menu_compose.png         | Bin 2014 -> 0 bytes
 res/drawable-mdpi/ic_menu_folder.png          | Bin 1155 -> 0 bytes
 res/drawable-mdpi/ic_menu_forward_mail.png    | Bin 1489 -> 0 bytes
 res/drawable-mdpi/ic_menu_refresh.png         | Bin 2450 -> 0 bytes
 res/drawable-mdpi/ic_menu_reply.png           | Bin 1864 -> 0 bytes
 res/drawable-mdpi/ic_menu_reply_all.png       | Bin 1960 -> 0 bytes
 res/drawable-mdpi/ic_mms_attachment_small.png | Bin 1113 -> 0 bytes
 res/drawable-mdpi/ind_default.png             | Bin 310 -> 0 bytes
 res/drawable-mdpi/ind_sum.9.png               | Bin 674 -> 0 bytes
 res/drawable-mdpi/ind_unread.9.png            | Bin 728 -> 0 bytes
 res/layout/account_folder_list.xml            |  29 --
 res/layout/account_folder_list_item.xml       | 102 ----
 res/layout/email_activity_one_pane.xml        |  10 +-
 res/layout/mailbox_list.xml                   |  32 --
 res/layout/message_list.xml                   |  31 --
 res/layout/message_view.xml                   |  53 --
 res/menu-xlarge/message_compose_option.xml    |  40 --
 res/menu/account_folder_list_context.xml      |  28 --
 res/menu/account_folder_list_option.xml       |  45 --
 ...count_folder_list_smart_folder_context.xml |  22 -
 res/menu/mailbox_list_option.xml              |  34 --
 res/menu/message_compose_option.xml           |   2 -
 res/menu/message_list_context.xml             |  26 -
 res/menu/message_list_context_drafts.xml      |  22 -
 res/menu/message_list_context_outbox.xml      |  22 -
 res/menu/message_list_context_trash.xml       |  22 -
 ... => message_list_fragment_cab_options.xml} |   0
 res/menu/message_list_option.xml              |  45 --
 res/menu/message_view_option.xml              |  48 --
 .../email/activity/AccountFolderList.java     | 313 ------------
 .../activity/AccountFolderListFragment.java   | 474 ------------------
 .../email/activity/AccountFolderListItem.java | 118 -----
 .../email/activity/AccountsAdapter.java       | 381 --------------
 .../email/activity/ActivityHelper.java        |  13 -
 .../android/email/activity/EmailActivity.java |   1 -
 .../android/email/activity/MailboxList.java   | 331 ------------
 .../android/email/activity/MessageList.java   | 354 -------------
 .../email/activity/MessageListFragment.java   |   2 +-
 .../android/email/activity/MessageView.java   | 374 --------------
 .../email/activity/MessageViewBase.java       |  31 +-
 .../email/activity/UIControllerBase.java      | 136 ++++-
 .../email/activity/UIControllerOnePane.java   | 424 +++++++++++++++-
 .../email/activity/UIControllerTwoPane.java   | 121 +----
 src/com/android/email/activity/Welcome.java   |  55 +-
 .../email/activity/AccountsAdapterTest.java   | 278 ----------
 .../email/activity/MessageFileViewTest.java   |   4 +-
 .../email/activity/MessageViewTest.java       | 110 ----
 67 files changed, 558 insertions(+), 3575 deletions(-)
 delete mode 100644 res/drawable-hdpi/appointment_indicator_leftside_1.9.png
 delete mode 100644 res/drawable-hdpi/btn_folder.png
 delete mode 100644 res/drawable-hdpi/ic_calendar_event_small.png
 delete mode 100644 res/drawable-hdpi/ic_list_folder.png
 delete mode 100644 res/drawable-hdpi/ic_menu_account_list.png
 delete mode 100644 res/drawable-hdpi/ic_menu_compose.png
 delete mode 100644 res/drawable-hdpi/ic_menu_folder.png
 delete mode 100644 res/drawable-hdpi/ic_menu_forward_mail.png
 delete mode 100644 res/drawable-hdpi/ic_menu_refresh.png
 delete mode 100644 res/drawable-hdpi/ic_menu_reply.png
 delete mode 100644 res/drawable-hdpi/ic_menu_reply_all.png
 delete mode 100644 res/drawable-hdpi/ic_mms_attachment_small.png
 delete mode 100644 res/drawable-hdpi/ind_default.png
 delete mode 100644 res/drawable-hdpi/ind_sum.9.png
 delete mode 100644 res/drawable-hdpi/ind_unread.9.png
 delete mode 100644 res/drawable-mdpi/appointment_indicator_leftside_1.9.png
 delete mode 100644 res/drawable-mdpi/btn_folder.png
 delete mode 100644 res/drawable-mdpi/ic_calendar_event_small.png
 delete mode 100644 res/drawable-mdpi/ic_list_folder.png
 delete mode 100644 res/drawable-mdpi/ic_menu_account_list.png
 delete mode 100644 res/drawable-mdpi/ic_menu_compose.png
 delete mode 100644 res/drawable-mdpi/ic_menu_folder.png
 delete mode 100644 res/drawable-mdpi/ic_menu_forward_mail.png
 delete mode 100644 res/drawable-mdpi/ic_menu_refresh.png
 delete mode 100644 res/drawable-mdpi/ic_menu_reply.png
 delete mode 100644 res/drawable-mdpi/ic_menu_reply_all.png
 delete mode 100644 res/drawable-mdpi/ic_mms_attachment_small.png
 delete mode 100644 res/drawable-mdpi/ind_default.png
 delete mode 100644 res/drawable-mdpi/ind_sum.9.png
 delete mode 100644 res/drawable-mdpi/ind_unread.9.png
 delete mode 100644 res/layout/account_folder_list.xml
 delete mode 100644 res/layout/account_folder_list_item.xml
 delete mode 100644 res/layout/mailbox_list.xml
 delete mode 100644 res/layout/message_list.xml
 delete mode 100644 res/layout/message_view.xml
 delete mode 100644 res/menu-xlarge/message_compose_option.xml
 delete mode 100644 res/menu/account_folder_list_context.xml
 delete mode 100644 res/menu/account_folder_list_option.xml
 delete mode 100644 res/menu/account_folder_list_smart_folder_context.xml
 delete mode 100644 res/menu/mailbox_list_option.xml
 delete mode 100644 res/menu/message_list_context.xml
 delete mode 100644 res/menu/message_list_context_drafts.xml
 delete mode 100644 res/menu/message_list_context_outbox.xml
 delete mode 100644 res/menu/message_list_context_trash.xml
 rename res/menu/{message_list_selection_mode.xml => message_list_fragment_cab_options.xml} (100%)
 delete mode 100644 res/menu/message_list_option.xml
 delete mode 100644 res/menu/message_view_option.xml
 delete mode 100644 src/com/android/email/activity/AccountFolderList.java
 delete mode 100644 src/com/android/email/activity/AccountFolderListFragment.java
 delete mode 100644 src/com/android/email/activity/AccountFolderListItem.java
 delete mode 100644 src/com/android/email/activity/AccountsAdapter.java
 delete mode 100644 src/com/android/email/activity/MailboxList.java
 delete mode 100644 src/com/android/email/activity/MessageList.java
 delete mode 100644 src/com/android/email/activity/MessageView.java
 delete mode 100644 tests/src/com/android/email/activity/AccountsAdapterTest.java
 delete mode 100644 tests/src/com/android/email/activity/MessageViewTest.java

diff --git a/res/drawable-hdpi/appointment_indicator_leftside_1.9.png b/res/drawable-hdpi/appointment_indicator_leftside_1.9.png
deleted file mode 100644
index 0a4f417bbe04704851ab69f32ebf4bc79675e0a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq000pH000sQ1^@s6z4<j%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzT}ebiRCwB?lg&!QKoo`Z`xL%Gx4uMo
z1z*91JF5XJf?Lsr=*Cr{yMl}Qvn>dMPhi1Sx4wiVBpJ^gbB3Ggh)^$_+)QTfmot-_
z*ccPVacrV31NEo|<X}ECbzMhQRmnrErfGQJKr84CHPeUjWbK0zx#W2sWm#sGB+1VN
zG8~Fh40i!3+O~b)yS*xWh;?%ObZ?!MWobnhC~}#SF=7dgo{O`}IiU+Wq6@m}9Jx0G
zHiRyF+ey>32a+*Ca!(+k-GPor*B65xgoXNSe30iT1!&(vI4O&HsJc+E(a!)G+V#3e
zxIlfGU)9BqbFyu8pFc{Z;{sjS%b~f>&F6*_=>skd^@<M#=*6}Oi$nTjD-F_Y10rwN
zo#|(9D|hJF54RmDCV=-W(#2{!OMoUEWQ54SqhX=LMd26H`Qy>)jozAt2!IkuAXd;T
lAk)R+$vXHK|2Mt`7yw0<9PoTRWCH*I002ovPDHLkV1ieazl;C?

diff --git a/res/drawable-hdpi/btn_folder.png b/res/drawable-hdpi/btn_folder.png
deleted file mode 100644
index 516e00e8731673ff39527a2e2ec3d59028e7a273..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1100
zcmV-S1he~zP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#?ny*JRCwC#Sj|ftQ4rtVB$_m_u}M>D
zjVZP%r3dRlp&mRmJqbb!(m$Yxy?7J+11iOnc<@$Fg+i?t52D3hT5Uj7s0R;PFqZ_Q
z`7$9U=EHpKcAiYinq)WGe5?pN@Z%*9_PzPNnK$!hXpZBkn=G_KKp~(IPzWdl8cKks
z=_`MWK=H<caJ-R^rbvmt0t5;Qs}O1&nIaN}k6Az-kVCM|B2p~@29<6BXb~+)qMQYY
z(iy-7AdSCsur^zhThMe}1PUillr{_x4|h&aProx53^tZ!nR1IV48umF(Zk8f$*&t5
z8$OsyAenrn1LY~k)k5HMf)6}>qP*GRaP%gV$s?{xiN#`v-QC^2@NFmH4mkjTz5;Z(
zpN3~)T8zLIeFX@Rg&%BfZGGe<%F@!(2l)0mzz(nhx&&ZF+y__y?SNZIgsGN*x||E*
z0vZsrRR6Wx?N6qrre5fDx{KD<)*QHl;6(=4<6w{c;^N}r`uchprjnAQSs4ouQbxd|
zot>ReoJ?|dcIF%%9eoP>-o}7I*XlwA0*|-1x92$-B^V5TgMB-Y1pi(z1wz%h5G8hr
zh=f9+KbxDIKlb+ajv5u;!QC>TP!xW)q2eTpWicdYF`|{Ylv?UWySuwz`uqDoH!0DQ
zykSPANj^zoNKWEh>Aeteq4shv6p2Ls!u-pTk&(9^kLMTUg?uwz3PQMhW@hFUk|Hj}
z6zj`KIi7=qgWqJFot=Gev)LRFVHm230+H<D(9qBu;$e6fN+X$+1&@!9NtUH77Rxia
zUYqfFJR_FiBoT1ATmdp_wc5LK5%7Aw!7`7>+6e6L???Lj`t&N5N+%Zqx7!^MOKMdU
zATP_6m6g+hfdP}81q+1h6J7|d-2&NcHhO-3&i3^5bjYPVM7iAZ^71K$S5~qG`0toh
zDn%BetX8XR{+~{#19<vu-4;kB5|<a)Y&Og0La=ABh=4Q;kk?}2H@HuPj3$%mo{R)S
zbrIkTWMOg|6jWxiSpW*8(}ocUhr^c^(ChWGU1HeNU#UUBh}EhP1^#C~qtVy~^|1*o
z&?OfEzu$ktvj8R40#_Ih4i1j5uC6Z0nZ)41=&!|v3g%)#S(ds+aXOveTJHe)D4Wmc
z<JYA;?44R$TMJ+@Bgut0B#>EHSoogH<zm-Cz~}S*#DXR(W&yPbf%M$moC_}U>xqep
zaTv8ijjcwCTCL7Q{P&EFjm={<mJzdnSZh&(-2ojI6dHlnVnbV>yf$SD%gQXyakVyg
z)d+^)9cYsBLXBcpYIBz=YNykcT7C^CA=uoiNZ_W4LO>y)5Kssx1nQE10t^6|+2x!O
S-47xF0000<MNUMnLSTX_7x#hy

diff --git a/res/drawable-hdpi/ic_calendar_event_small.png b/res/drawable-hdpi/ic_calendar_event_small.png
deleted file mode 100644
index bd03ebc0c07d96bf18dc6d0f2f973fb9a77d360c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1037
zcmV+o1oHcdP)<h;3K|Lk000e1NJLTq001EX001Ef1^@s6SLDKP0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#uSrBfRCwC#S4~V4K@{%(^_K`+{6z{R
z76PasCITVxVvI(kAaYScB47wNPagdt9*8EMi5D*<gp-nTQ4d}q5*0-Sq*WmlF(_^M
zE!}pv-5uYQt(K+>yHb&ZlYHsUyzT5a?|t*;4S^8S{p&_-OA-V@Y{`e?zpI7B4nP6G
z2ABmn0SmH?1r!1H0Hy(-0n2JhL_6_Vr<L4kYjgVje)OQD<2&>#;%pUo4BPNK_+2%g
zh=J7L!K@>trP<LhR#s+OjK;D9xp_v}W-G6#v__ehl;otDOozdyS35DSFpekK3D^fP
z$5tyLT{Kpbgh*)Td_J!Sx?aFBh~laZA(|w}8jsiGm&3&Yu;+XLL5nc6YHO;mS5;MA
z7Dee7(eu^S89BMR^!)rh>gwzak`%?mu!wE-4GmV7Wl8tsB<giIf)quCFei#4BLf2i
z-93)p`_P}!qKTvT+S_Mvj8lQT?d?Cz2E%a(5v4^FX7B)$s_htwM9gNBxey*L$?Qrb
zAp9t02}2S^J<TwA@R+8B#FD`C!Bmmp1wo=nid5PNO2SOfWZBz&{r%TKh*aIhTAt?x
z4s1weHY5xNz4_7O9)sKMMrTf)9tRQ+X`1Sum~wwj6sFP^T?zyOUtk5%H$AhS`8nU*
zC~Qld1tk?E7;C2W5IoxXP)HXJhZhYNJ>D51EqOv0jzl=v`cV?F6<1)(J*P-=6zgnb
zA&Mp-d<Bz`y@zwg6kePr5~3u9VNJ26g^+|?pr98@2`9dBK`xC&?8!LK;C!+Oq2M)<
zNYDwAC*oitLB(Iltn94c9z)U9DC&vSZG-logeFa>k&S%v;u9C24{4D0En7{(aIm<z
zJja$@8w`eaOGwfi4aTxH6t{qcrNC~l@9gSoO*9BX7(smz+6qlD0gl_7IEd?xTQ_ga
zFbuP>X%dnoGT>rn168b<3)c}>o0~n(G3O+l88}-8Hx-WJqGFrllj8y>@HU0C&91Dh
z6vjHsOG~<@#zwzu%=L|->5q`Y-@@?RpWHj@-VF_P+w=1^6*sFMX!4JI7#RlwgFxUZ
z48O#+C}dkPS$Vf!IHvpi`WCbh;5ZJowzPPM-w#g!fj2<l84SNlB%s9;8P@dlvou9t
zA_&qB>0bc)0VEf;NfHG?!g0&!8Ih(a7Z7+Ndtf#h0o6A!C`|Xm&j~=8Qhk`D;nIE(
z@LGw0RucGfvrE3_snG_K3m1=kbVpKs7u^;Y;=e}XrvL*08+ILMmLyV!00000NkvXX
Hu0mjfK%vaF

diff --git a/res/drawable-hdpi/ic_list_folder.png b/res/drawable-hdpi/ic_list_folder.png
deleted file mode 100644
index b045cf94aefba988ff725746a2957f6eb88ac5a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 916
zcmV;F18e+=P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Hc3Q5RCwC#n9XWhK@`Ww_?3{T;0G9P
z6hy(Lg+TiPF1qNZP^k0;O5Y&6(r#J`S@Z!4b!Q<^+!gu&foxhgC4oTDAPIgnY0#Kx
zjQ#&*E`+o-nmhN>(iu1?-s{Zyo&Py!=3dumG!p;vaA^PypaC?12G9T+;BN*f7K@?%
z{rzVb7Z<5X_j$eEZ^>lxT{@latgNgEm&>KZ!9*f)dw_DeymWkg`~}WrB9Vyjcs#$o
zZ!j2$cDv25U&G<>y-X(4UtC;N0)U`QyzZHFF&2wGSzcbwM5EC^I&Y4Czb_h%#+_cT
z_psG!eZc2b4njHM_xpv<=M!^tb29@@^ePYtgy-kyh1=~GH>DaK;eCXtR;#<y0&rlB
z9i&PJ=_lgx_)H)Z0hq^}Y}!I+B!j`=8q#g8+wD&EAEqDGJ2*J_1eFU2#1AU21b~j4
zb`^?|rd^K|qeoj^U7a}<&?N4|-T>(7ES+&8z~$xT*vyVXhv_&X^%>va<EI@}?NHX(
zIPZqTp?U?(bi#OvC_QgBo1#*w2y`hW09@nz{Cu2FP+|;Z7=~b7C{cisM`X6>{Py;?
z0q56GPfs7=Hn$xc6l>$?=xC=@Dm^F^3cHpSkT4tUE|~mPE|+_Z7Ax5ARc%_=0ZvX%
zvQUFTdTkkid5KB)s08+hy9)~o!rZLvIF2xduqiUFI!bDQ3IL)ei`ih`cj6ocb!$p$
zfC|74;dBVL#NT+$&LP*YTLxhFK`svAcpY6LbM?BNgF(X@w^!h58eyU)=R_SOnV)v2
zk5s*nO|fZN0SQr;XClLi=u`EZqCa&JOOP4?@ENzO^IQ)e*02U(Dj@Ap!X!;72U4i6
z>?px#$f!7?fE;xt3h;b#c6N3M<7SrR!-o?JSgrxt`*|i2wOTEVRvHh5LfKR*HPeaF
zLK{^BAP;lvG(Mr38=KulY`F&LB#*W{^JKHxU%>24AFgY;3*iy5V?I(k`TmF-CD!F3
z?z<%b6zfN%%?nsqM#OgK&8I#zj*V#=#f>kvHa9m7D6s}veNHKW^xQ+odkgF3^ZEb$
q)uIN_02)98XaEhM0c;#U1sDK_1b00M`ua)$0000<MNUMnLSTYo>YUU7

diff --git a/res/drawable-hdpi/ic_menu_account_list.png b/res/drawable-hdpi/ic_menu_account_list.png
deleted file mode 100644
index f858d2c8a86a50302096b17e8d9ae22c0fa56e27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3662
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

diff --git a/res/drawable-hdpi/ic_menu_compose.png b/res/drawable-hdpi/ic_menu_compose.png
deleted file mode 100644
index 6ad379e22a24fb166831766e597f31a763a7eab6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2993
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

diff --git a/res/drawable-hdpi/ic_menu_folder.png b/res/drawable-hdpi/ic_menu_folder.png
deleted file mode 100644
index 31cd490e7d999e8de25c378f6cb36a2b98e0c69b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1519
zcmZ{kc|6p47{`AzW*kErMNzp^a?Xrn#~3x^$T)Wx$x$(wapWA=YcPzAMMb70N6E2{
zMp3S)<c{PHNpfTyNn&Y<#g6{i*X|$t$Mbx?&+~phukU}KB%-zHKG+c$008^U2*$QN
zCG3?Tgx7bukzG6iyIGhT0{|yk5yhK?0tt@6dnZ5Z?CZ;?_m*LSc+Y>9J@jQL06?0}
zjPZ6}<6kqZd?n6_x9`r4XTGFY<>5f3_}C0V)wurKNl0XWD_p|ojG7C3LrmcnR3nir
zukn{Feu%{sdWIV58%~$Z);^vdzrt6ItUzkpg2C$I&R%o|V|B@(y)Cj$Az=1<x1Da!
z?&A1Z=2rHu-ujsSenOhEO}=r`0j15DYgaUN3izz#3eB&J2^K2}=T2L*YXGkzb?fCs
z`?<_dwfd7p)zSV$4Ip`aK4R(ve<1a7c!WO1<E1pr((z!Zc}oR{u^`4#s-xUxwss_b
zMQ^UyZ-m$_0Yt?|Mo%w&sOHvTl;Jy8kPS)p7yaj=)s2&Hc4fR0w#;^h4!_W}e|*v|
zp95{4?wOzGs<@*=z+zPQ=l!f6JrGpfPa0$~JV;Cq<;?5)fEqd0f3*n|&7#ao-+Ex?
z62$>7XqlKS4nwmt4f7OIaikQd(+I~CFpdJKAH6-cV<Z6Ym51W+c>LA3y$*_%0~g9a
ze$-<XTBf$NcC2o9I}g7hp=G2?CSejm03c%Wd#<OIeL{RkoLEhl2<>}}Uxd_1*MfAk
zz6z0S_(OnDWlnA)E*#-!$7hkNCTUuNBjK7Cx72lJTndxHYp#kBD$twGOk<9+!OhcY
z^nkd`xGzdW3(5?rjED~5sW+?XNeNCN1x*Uus$|%Zfn3ILX_alHYdRlO5;z<uQb+xE
zjgendHd9ZCYp&rAl()MIN*?bTdl&uK=H5)Kc`WP(c{n8|qG}cG=VWs7kY;%jxA*!7
z7WP$+zrp=)7pFziEMo|rwM6`I?GEl+Tj(c0=h~<TE}Ve#EGkxWbuzYmf>>DIoA;Z@
z9|dQ!Zav$aax$w6qUScD#uBrbDk|A1F+Qyoh`(K3DT!;2l>xYxooyP6LV)d5xG+S-
zeY2_a;^!+ReTV{nNG>u4lG-WlhIrUW*-*q;YcAXU&~?zIfVFa@_<h9_AYdEp?W6o2
zLP>Jbh>gwSf(f{3FoD(NUPs0)m{|BG5Y#sK0|%y}j>{bq)@RqlI$+9WRf^-Hkh9}4
z;*Qm4T#a#^RL#hjVY4V)>CnRog@gkmsuL}p*&y7^W~#$7H%Tq`{5V#kjqR2p-$+X}
zqO7BY_0{G2w!!HcdIwXxXA=O@=UJz~lE5`o9mW^<SS%kDE0_8(CR$bl3XUIy8#QK;
zdy=OlJI=L9>qiJe!Xh@C{R7jcO`iz9zw7+#Id2*yxAsjAxwyS-u{f_$EU)x>lMm)j
zeV=N?1GDzv;=XmMSH~&~IBp64)G?2NJ2_E{gRM2Al*EQ0xT{w7)HG2$0b+S-aOuUD
zwfuUWBk-#Yp(7JFm@7_l#Ca7y$f+@P`gx11vw6bo#vPD@p2Gtp+|fkX<qK?8>qU1W
zUM=d+cYT8bKwX8f&j|FELwAbT32F^8?osMpx^mTw06?!v?jvpAn!}9Rl+n^sq|FPf
z!{2XF;MWY9U{Zfk`1}2`>*F(#?g5ejAf~=_e<$Z%!?tML$fZ+#{);VJYw1y!zG8Fd
zW@J$ZN;%d#BfTXqDaLf%QRX(L^Ip>^UiLP_jeruJmN-^aJ7G{s*--icJ8bxj_%k}p
z_cEjb)QQ#DS!3R-;6<BKh>1gp2RVd-ai>vu0-z8`ggOGPj?}h8X<@YVFuXV77YqVH
zW>nAo$KV&>;Z3FgzX2|{&yi=?zxM;x+c$(l!?^i|(g1`8k`&?@#Y3Y1LcRfRlwd$R
xv_w#WN2K-$DS#RhPNq=+yax};nfZ}DDYg`{2R-OD1<N}E%uK9}%M4ww{0+VZm_h&m

diff --git a/res/drawable-hdpi/ic_menu_forward_mail.png b/res/drawable-hdpi/ic_menu_forward_mail.png
deleted file mode 100644
index fae4f2e40cf3b69ec89c33bbad38a5329c8023c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2187
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

diff --git a/res/drawable-hdpi/ic_menu_refresh.png b/res/drawable-hdpi/ic_menu_refresh.png
deleted file mode 100644
index 53caccace3947f3188cd58283efa242b6842d5da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4174
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
Y05TcXOHpk)Pyhe`07*qoM6N<$f}SD0=>Px#

diff --git a/res/drawable-hdpi/ic_menu_reply.png b/res/drawable-hdpi/ic_menu_reply.png
deleted file mode 100644
index d4f7b500ff2e5f40c7e6db1ee0f19850d7b4cac6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2791
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

diff --git a/res/drawable-hdpi/ic_menu_reply_all.png b/res/drawable-hdpi/ic_menu_reply_all.png
deleted file mode 100644
index 3e53e29a8fe6959716f4452925aeddd99c7a9650..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2987
zcmZ{mXE+;-7RQ62VujkHHA^d2#7b4gR(sVbHDj*?wQ4j{T57cjYDDZ=s#d8sc8XFI
zuNbeIt(Cs5(bBkjKiucu5BI}4|8vgo{GapnJhm`1U<C<)00021k)f{Dxf=e73&8Vy
zwiYvbF0}5(2D$)1ZJIdrykiP6bO`;k^6$_m`D^|e-U~r^|7Z9iib4+nfZ~jF5jH+c
zyADxdHlKv4aYsF>!O&+Ui7YI($?<TEfG2d=L}TgPbrC8EWR{)>z@Iy1{&uQC&21n(
zJ+DnI=907{_gC!<uF~oX2Kv8%y#lnNBonC8{^H5@WhEw~Q7pvgj1)1RuTFY?vbay3
zIohKu`1r&NR>nW(1Fqg1IsGp0fa9Vv0Z~snInX_f6Q=b!_b&~3MWt#LJ(cc}puMOl
z6~C**KOJ_5L+FQ`Dk%Sv`d%-JI!^ga_i^^-cK)!kwu*zX<SQQX(BgGUCN2?`tKx^F
zJC>X-ix9X7byXI7T7BD0YekoQl+IH4aXG=dE9XgMcH$Su)1E~3yRra3LobE7kFP7W
z+_V58CS~1pD+mOtjo$#gqDTvoqG6H{$g852o2qS&VRW0bbjQ$n4yKXRFnsY0u9-~R
zg$ygz$$9R@=$5m<Gl3~nZrj9HDdoIo%wf&SM66K)Gi%!fW-g-Dmxa}`Gs=rqOjK0M
zqMXRW%CA1Tx%A|jGXE@BjU91QE*0hR$YR7(jN~Z8={nP^P|kdN0-i(ZoLEWK&R_Qx
z{ep)qybN=>73X`EFp!w(^H3+5Sv=(8k4{dBMiF79N9iPYp0%sW-@}hGEkyVx>HTpB
zwwuV^vrefmO8d@3YO%j{HXbSQbEM!UA_H?E1;n!Kz`3T7y<5U|;A>U3K#Z($o5`gf
zlwTx%(Nb+gWxP^m){?kWS0xwu6P^)#NbOS9C~1M=FHP@!M$0w6+zD_>6Sg?;Gte(`
zKi&!BOkY}-+B8=kz5MFfhOyM@sL}Lo1bT0*Ax5;2V&tCn_WAee)rg&Mp8bB<%a+WF
z0Qz3Bt>{lJaOX;htr1~Z7sr#ekhZ!!{{6nuhsDGmKe95ZwUpc~bH*&lHu_I?gm<Mm
ztGK{*#<~zD1)eg$z98&K9^jthHF7$-{4`)NvsGQPrI+{Oovz6Zmb-M`mcOnizQ6J;
zgIYx0yNt%^?>Kp}rnTATBEiL>`1}H~>Oobefv&Fc0`!=FyZql_7vNOCp%VriD{(AI
zhDi<>Q&OlAS`;)3(mfet(K~c#WNdn_;u9!iJSa3fj8ETicqm5lmCd+$@)7HMr%EVS
zqhWg^&Wm0CKE+2&ACz2us?WY4t!?mT_D$BIx+McURO2lqZdy)B10oPy>Nqbh*<6}>
z0*@_=e@>Z~BVw=sgf%T^4#F|})#+}Yl-)fRmp&Ue52>wU#cBD96nMi&xjOY6Qg+QP
ze^ZeaFi`?3Dgy9n;G>nuT)XkgXF;d}Q3e2%(WsaN=U#SvI<?kopQH6IL0pu{B1uxK
znMTXVS1XZ7S?$IC<6;wd1f-GY#EW<!@T;;hjlK3QPdH2z3_C02mxtM%?p}ex3>_vT
zrs3c%Zi+gDG{#_)hBP5K^80H~ufGHdetB=6AZkM}ab7;my^~ZRBLTy6dj3<{wi@)S
zwKET<)SSAoR-*!W`e`j>6{yD)wl0OY7qR?>izuACxnC_zl^({tf%@7Wp?<f=2Ji;T
zvA=Y^k{f{knhDM!`&(JqsW#12QbgBR9x&fPGG2rhW*R@^?Wv%Pn}s%!KIv=<uH`l9
z0R`#}2Ui=ISvmUUR+!5-*ka3cV~5%4dnEb{K_{E+E*AB6>igsu-v?iaPj$4!qJBye
z>+w%~Dlades5FyHxcle9d$eaoI<xyw{aOtcnz{JF4)0?bM5x!Xt-@V8;a<^P*YaRK
zTWDj4O9J<7_OuVec0ZXg?!(qA?-ieko2=U+OP6*WSYuNcYKZqC^fZxlp%m3UY3p$o
zNBh%5@0Rsg$=>v_j1;ix$jcT)1HuU#Om4{!8t1s7wZ%YrsY0o&UMH|Zu<trpe|9{M
znQzd3?z}SfSEzMW%!mX`JhzJb=X^gTl})b_lwSP9q&7y=S%T?0qPu-LucGRy)Z^x-
ze>1%62Qs{#<j&eJG~GxWxgWX+uFtDO74aepoS@c8UQb-8x083jI&8-zIvb@6sK*|p
z?8zvS3&of+eiZ$BH@Z^=-_JI=uFf_8wddd`R`LqM_M+~l9vHt;IRklV_g4LFe7bX9
zp?5yqx|6ZHJ$moJ{7b;uE!_KSQOA^d(-O1iC=p-yTWmLF2=3NAC(F_>o+8@SIAghg
ztAPf*Fs&bR5)>=5nIr>>!SO`31~fc_??>-88tE7h>1ijGkkxrTxgqyG_t;z#Dz~7a
z(-D5ciq#-<e%H`MdKv?KX{X<9L%t^6+}HTs6>bk|<Sh1gCvD~Mgs&{9ShzK0a_%zv
zFOSDzIowR6(Qf@Qr`QEv^`KUV5xs&u54W)t5ZJf+Azzgm^Hbo}^?tn2`a4kr^y@{a
zg9cZmVnuQZi32|H0XFdCZ|GS9*U*G+9O^-on71BTb5L@|H@NDBjseV$B@;GjDWIC-
z*PsI&Gz-Tr{l;CYTd18M6G-GpTGPcKn~id5q$9H!c2Pv6;RUVZkoxh*auGtFs@h!9
zKLpL?jR0B<>K|rk3rat4J&xDZRTFdM-@fvtR5_kd^m%&KE=Pfgf2C9-_@>h93Im@6
z0<VoK{DMWf5AE?df-<LioZCYP?qW@(lVsT&HIw1p;&mMv^EdHyw^LB9m3`NXddLl2
z%$d}U=2X8$Fvob$*}G>97dUr$ZWf0g&X2egsI<QYKfkPgm@cj}o^=DsS;PuMFij@!
zYF3S!Sk!OX3>GZi$jGiMD@9)cOK?4s&yMOLD7CyWZh12b(VHwyBq2@`g#XrFDwFz3
zTb?M0#w4Xs>7{>VwdcPFnFTb*517<DcE@j1qFzX)v)ei?rhTw?Gn0-g^*`o(>)SK|
zvA*ZY(?!VW1r#^#1ht9=&D#~mg`|Ch>rW+k%t#gBiMi6RcfV0r>8uxUgL!a|N|_NB
ziq!W}ScZ!F1I{Dl4(gj$%00!}-%jgJJhj*ADwS^1*Wgt2K;l<by5Ez7MqDm+c`xAt
z7WP4XI(Az-l)jlF^XjY`6HjU1<E7yb@d>>q2XJUGr8ycXSFfT!L7;!IfL<Sdq$!3u
z={DAX(dEky2uZEM73HP4ITQj*7bja@Of@a<bUQ+35AM_xF<iinN4j69SLO<|#_?8A
zg4u|>TGV}ef1mu6OT}xj^(?EdtgZ456Q{#Ap<N-py6A7Jp9lKloF0Xv`OeCg8<i#V
zY1S_ch-Nc$i^H<E_^kZefAk%NZFj~T@E*Eszp*G=!Uho6?IjI9_tmj=TTS)=-R>}@
zhu@$PbGMcN#Sfn??6N0|#n_rJB^k%xLL^}Nqfs~7B1k8(B)nBTShOvW6(j1D#He}P
z))pyuVwxZ{c!$qActamVn@-@KNeN(3@hsuz*|J_DXMt#GZ}$X0j~L11Zp4g_)$O<+
z3-*(@aCTUa;r<J+`@(hd*3%oM$Ocaz;<!tU;4|@3+`BMpVl&&U191HMA%+H$W$dTH
zDMuI>bfq;bTL~U4kk$lX7~9K~E0|R2?R&L3E^m%RvIIz+I_1`+`xrOV)b}nEEe_OH
zk4X?4+nK1U0DYzNAMlKs%GlRw`@|@6z5M(wl?>Cf5A$>jL&81K$a4We6%-X@71U%E
zVKz`DxRN^jyjD<!D=4_dwyyt=Au!m}*DLD(8^9v04(A5;KNq}w1HzDKxO+f28lWJj
zXdUK#{~WRX7YYb=M}`7m;nf$!&I$h?Vjb)i7U70Q0uY|(P{b(E%^PWjbn}ctk&qha
PO8_H1Gu=jQSIoZvPG@pP

diff --git a/res/drawable-hdpi/ic_mms_attachment_small.png b/res/drawable-hdpi/ic_mms_attachment_small.png
deleted file mode 100644
index 491095114d985a93b8e048a418c098634823545b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1905
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

diff --git a/res/drawable-hdpi/ind_default.png b/res/drawable-hdpi/ind_default.png
deleted file mode 100644
index de59aa9f5b552bf679dbb21447b6a438f83f4f98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 381
zcmV-@0fPRCP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzA4x<(RCwBA{Qv(y12q8S{{8zY(Vq##
zHb6Xug#ttBfVdILc48vakRl{QK;R2G2BiUUFPc~-sa}f(;+be--3|^8Ymi+eN5GH}
zAfAsVwgcoE5Cde8JrF+!;)g&y8HXX>K)e))nUTcq0C5D+HGg3Sfoze0O6CA@3z{Jy
zi&g_M8*<<RaS#xHgb9EQ;z83`4aB8Twiys_0b))xHE}?E8Cd{iPz@HZbU|IV3yVcf
zK)fDZ1IVCRKs*tPVIY_Bqls;W8pMFjAP^`9;!Ol%?IsXM1My#c27x3afcOFqLqLJ*
zj~uwT3<81gK<op=PqC<rgSv=;7=sv~hIm2^g@Jk^yv=|ui-4ll4VtGwUhN~QJfc>?
b1`uEX`ZPIm+n`}m00000NkvXXu0mjfS{jQ4

diff --git a/res/drawable-hdpi/ind_sum.9.png b/res/drawable-hdpi/ind_sum.9.png
deleted file mode 100644
index e7164a69b37a90524447699e9ff8f2dc6ef73f95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1030
zcmV+h1o``kP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#s7XXYRCwC7R!dA1Q52nFfJ&i~rj=Bo
ztr4i71rX3iS%4uitcb+58lo$LJ2qV@BrFJQSV-bVH-?Rinn2Qq6cTqDAOcO~V^ag6
zn2I$00JWd#jOUU!WNfVRX>W3p&b&A0ynB1!y_e%oZ}MqB<WI0y05m{3a1JN}Bp?AC
z07)Q|4^f^8TmWk9cKeOa&dys^RaGWQl8Ru`&dyG7dU|?(Zf<S`djh~ub`beA5hw+!
zfqP?PWA9g2R|DyET8=~_GK7vm&-9+wX&>!p-<9TYO6GG2mH}7#`ud(a9F9jCjmEIM
zyUXqE?d3eBPN(CHMkAL@CPTx+!*9pO$6w?1H{e&6*Rqg9@cQWJ=wN?;|6_Pl4iMQt
zLqqG~aG1+vGTQF$Zo9!?Fnc_nRV+mTQMGkI$P%PPsUH~`8SLrlx$pD&_*5#z$+CQG
z(Ed;;#CLRbTs51`7Ps5I2+oKq$^H<fY`oOl+xram(C_#2ClSjAgt^w%*4lVHE-oxA
zc)=ZGVIJUBUh1@3?OkNy8-&R~AD-2Cp6B#>eF$0q1mYj?ijqPSRCmxiG&JNuNSYFf
z1a}rM72sNNxK>(=#iE;;nfVBfFz~#XiBfuBZfk416N|;Td>Zk!x3}LWeqdAiAIU1P
z(2Q^xk$qggLA=CII%?7LEiEmLxafx=$v23X_$hBlObKrVN?SFZs!&G!tZpBQQkvcr
zMX|JyqVSk%c!?rP*QFWtQ>0K7%5Wo6N;y=*o7mdg3N|z}6ihS_2n1R8IZC8`uh+X$
zh$K=#{G_Ay^Z=#m%l7tm*km&4^X+9Y7z`6Xe#X_FQVZF{!g3+JBwkh+l4{X3@ckVO
zr;6pXFc2T{62H>o6j6GJpe-#=PENX!$x=Q%gsALtxjf+Yvi2q_g<d_~r8hP<A}G=p
zo6TlEYr#h^ou8VTdIjDU*4jw)MYbqahl91XH44SWy1F{5A}8*v@K8d;J~^Gvm-v2>
z4QolIpJtCMR2}FN$JW=^H!-FZTdmfbva&MGaWfUodv9W5!ZkZPOEc1E;0L>(O63{g
z|1u*9Y)+!FvleLV>gsyX)YN1{uQlWnLvaZ$EiHXTIGuQ;Z1n@X?3!d$!&%O0P#LT%
zm^k%9D~fjgHCSb3rCtz(VuVqQMx$Z;9cze+k6num7S4Uu04^VA*yb5ZR8u`2ppx1k
zpk)WkFi&D^>f2XM`)MX7|8K&Vxx(3z)^7m@09IG*D%n+q$^ZZW07*qoM6N<$f}(8R
AjQ{`u

diff --git a/res/drawable-hdpi/ind_unread.9.png b/res/drawable-hdpi/ind_unread.9.png
deleted file mode 100644
index 80e7c1f9facb94842528db76fbac2e0858b2f13a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1089
zcmV-H1it%;P)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#<4Ht8RCwC7mQ8FEM-<23?gl5Z^HIx*
z6>vf#LZcL^1PqM;p@yEglpcDigs6ndiGmO(6b`hJ;DF%5p;R2&UaCrn0|!8Sh@eJl
z)uxGCAQ8b(f?{F2#);*49e=FXGt>8?*=Xw!H8J)`|HF=E-*4aSn>T-e@`ot*MP&_Z
zHB>Fig{niTD2~dbGAIMZDgjj_pcU2L-|yYBe}DT2UT=LH=R#Fgg~#K$*u8t<@v*V^
z6s`%QX61*7wL)ororG<<bZOU@1nb(|;EQK6kSUl;3tf(N;B~oR=EXvU;3rRxev8vn
z5^lZ$E|e93^{7q9j`bcH9DM)tbZy@Ad@c#m^umf;vZ1j7dRpAjXw)UnpP&5k^5x+7
zIQ<fpD*-QqTEO=%Ufgl!vm>1cehWv`L^i+bAMbJ2!Jc*>zxrM1)~Qo}p2exBsH_eA
zAE+V=rRTzh?Pote-1f=HbOe}Kdy#620{gmsFno3P?uiqD(>N8Bg+{@IW?M_uxZ&v0
z?&AlK`wl&r4l5jiq72b{FB2&k*wfMtS+y7lBquPoE}=t;Ez3ryQ``6R*xn!hNX~l7
z$#7Y5VAS1iZ{nl=U%$v^*$7Uh>6mG@GuV0VT<@UKVQka$W?307%a{wutESVx(cL&a
zJoh^?lBln0B-DZG+WKMr?nzyTN{*PGgT8^LT@)V`vi>8DhJk^1{4pil!We@}i{esz
z;@F{0+jqG7qVqZ25?*mpT#8S1LojQ58=Ae~qpzygp!l+HFG8tIcjk)B;bdynpa$o4
zvb8Qk>A3g}vskR<TGgQ0JS$jT$=cq0^i?6|+Ulqp^q+7cCU2jmLRxq>VN6w{h%8Zj
z;@C6IOazQ4{Simf-KM%Lon<n{lN4Vz{-sQ*8HYjv^Kmt@q`0y%81_u*vW<>h%U|p8
zEB>ZdrKwU`>a#+pxD+2%v}Z~W^JW1a2W}MZ6iv=6ks)JTJi1-Dk8$ainYW-?iMumj
z&xm<d6&u(0C>?Lx@E_hOj*s1BSEPN>CG_i3D7B<aI4Gj{+WNN5)J24{Rv2S~kKbUU
zqu2R281JF<OV%YmRN4*5Qqm#Tqt8Sr6&E$Fol3i-e$i2^YNQj8{^cird-8!GkMtMn
zwLG6(E*W~0N7AHEA}835>f3oh`Lt^r^msbJvl1-v3KBDq;CbMtxQ>rht<$JEc}&<!
z9;p;uE3cwfc^7tK(|*_23%$-}aH|^Ba0bO}3X+i^1XFSNTONxUxt$9(11?tUdoAy4
zxqAA5X1WGZPWfR>W<o`hk|4|NTb@_^pV<~ry|KjlSAYQk;+AjokWd#O00000NkvXX
Hu0mjf@jw_1

diff --git a/res/drawable-mdpi/appointment_indicator_leftside_1.9.png b/res/drawable-mdpi/appointment_indicator_leftside_1.9.png
deleted file mode 100644
index fc110f5adf77dbeca77e0862a73ee320a1c91860..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 331
zcmV-R0kr;!P)<h;3K|Lk000e1NJLTq000XB000aK1^@s6w5dm)0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy?MXyIRCwBqkv$5+KoEtW`8D7<EUY|$
zg|(2zGl&;Zyn)~qOlM_hV`Zh-ik9}?!u;yIHM0a8eK71~^XA*xS={3>M6X{Vf(JY?
z*(6BQ6nUPbsw$LaNdWUi^6lz;JMr5A+6aQcgyT3+u~1?v1?$D2KdjA9L{Wq=4B>g6
zF}kh`-}lWb=B~udlDSDU=~{qKqk7th+}rP7YT(MCfq<IKU!9r^dm-(a>-V0?@A0Tb
z0+nT%P617b=wW*<iozP1t63qUgPjJ)#LKWijSXGp@>@&hgD{%Zx{X9eIA0zw=22QC
d{;RhD0|1~fgeO=;-fI8=002ovPDHLkV1oAXk{SR2

diff --git a/res/drawable-mdpi/btn_folder.png b/res/drawable-mdpi/btn_folder.png
deleted file mode 100644
index feb6032f31d93d6bcd685e980773c5a9b061485d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!bxA})RCwC#S5K=FQ52uQy*Kv9r`QXM
zTnK?B(K>L`2WS)6BJc|oM5|W%30x_ClfZ>ULAX{Thy+nIeDFqn${S-EXS}yFucJ)U
zIPaPl+<4%}y`%TfZ+`cjbI*vBQel@S2|Knuft?djybq!%UNi{F(|2v@tpxGk-s^RI
z#rL0xza1b{4+(eH0x$<y*b>SRM)+cvD*z?~v`i**TrQWN$+8@W^;feMMOpNEy|4Lv
z{u4Z&1Ac9z#7d4OzzzX-bX~905UW<JZ(&>#5C_}{z;!?ba0OpVT(_qZpoo@8Bp!#6
zPN&mPp!tA=oq!?BqcRcpTBUpnxa{v!4rbf-u-R<Bg7uEjpH@nQDIoaeB7`{oe*a^;
z-Tnp>7R>Q2NyM_O13admsDy=T5T-ofZeA*t-hk7+gT<^(d<*7Es;b_u)oL&6_4?~#
zvG@r6LcZ(>9xP=X3<jUG+3Zu0bGGe~IF4h$+IL+a^X?g{z-To3k;~;$5Pny;&3K>)
zMPHDZQ!#|2o=heaJW{S{nx}sMVj*w_AsOdEU^biS7@m}wK)2f+#$vIXoCpk&0AVK3
zXf#IAX!Mu|fyrcYib;!20q{@)A#@grM7SKmcsxGYNC60&bC8W_ns$o^0Z3*itUhot
z0FuZNu&w|BE=SO6wE`9JC!%YBdz7<54p^j8sfU>8#IQu<GBl^t=@*`5mth#+JDtun
z=vMS!M(zOP1z4d_cs`%c54{D+rUsP|g-gk(R4VVWfU*A><E^N~KedzUDajOHUAR%L
zgK+Q`w6IV9+S5lMtSA+>AVEBRVJ(6EhsmD6F6_4e0{~*=M4Qo8Vu1hv002ovPDHLk
FV1iNSM6Lh;

diff --git a/res/drawable-mdpi/ic_calendar_event_small.png b/res/drawable-mdpi/ic_calendar_event_small.png
deleted file mode 100644
index adef88433b75e01b47cd5b285427fc3092c7d8e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 797
zcmV+&1LFLNP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!zez+vRCwC7RY7YLK@{GdncXyrNsOsh
zTePXtHc~`vYY+JeajmuJ#aa&miCFLw6#NtZ0qv<E1&bbXFi1%#C|WQE>cNAG6-(`=
zNw;<rvztwJeWRPQ-6mCn9r)OpH#6V+=FNLMtYH|;el$|=uq<nza|3z-M*!adUrc)s
z;5Z-$_y{O9WTuLnsP4NLkH3~ANuQjUNCXc0&$RLUi5u4^W~uFNJf87;yx~*bL4Hrg
zRJ5rw0B`{YeLi0=A%vbK4BiD@*FS+hOl@ATw-5T``9hwmS_KqL^@g3;(Gv`YFJ6e;
zmy5-tnx-A-51n?>iJ_rkcTKOw!MA#Tc!WA<LZOf&B1EDb$BlVBp4I2c<b%zElmapG
z=da6#H57qMg78R|Wuq003PSSO;f}Kqn%`oPH7ts%wzrxEilUrE7zLrr+lf_(VWCxG
zT{jqvFmK+~ju@9x>2&Jx%*@qmlarn+<Cn{dqDqj46_!Q2(xz6`xX!LF|HJ8N_tUw#
z+WV!Y6_?W~(J4EzrW?jurK0I{Ad0z_{Ca*Ch(EwRSM9{rYSqv2{4MC7gOlpuJckex
zVO+5j(@Qk!>4Gtq;b<8`@IrmDwf)%I?0_|6%%2UgQ&*r{hK$g65$~=YLxt~8SX^l^
zUxp>MW}6YSPi^0bNeg>AX}JRiiltKj|0EuSN=q=dpA2G=_D`XJ)I&|?JFNpy%_I_u
z4NUNwHG7&WZgV)grOl1elA_QuwdS#4CA}GqZe`zPUvY%I1(V#2c$?tG{QM#K#F{y#
zq_<<St!yTnhCkdhjL{Ba`%&{^PF($4kX2P>?o3Tdi*FVeIF394Qd&eJ<omWTw*GpU
zPm{;zc8_4fMKD4GV01OiQG`@bxlAxlLG`@^(|0RrBVxvUYTC`0gx^CrR35VqknE(i
b{SsgRW?NB{xv0a400000NkvXXu0mjf0cv%(

diff --git a/res/drawable-mdpi/ic_list_folder.png b/res/drawable-mdpi/ic_list_folder.png
deleted file mode 100644
index d5c2dc7f116e3cc9f2044500b6a2fc3d78a1ae6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 634
zcmV-=0)_pFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!97#k$RCwC#md|S%K@`VlS6%$A2Ln-2
zDB`hKLD)l&4S`?|A%B6nc<I07Q7A<Uh2C4psdy+J6f7tN7KCU}5m#69{VrKbgMnE$
zsh555n04HF^O^U3GqcKWw-d)SRUFxT03YD!0Kt8otyW7L4u_Y^<udjBzf30cyU}Re
zz9|6gOEQ@}&*gGLRsSZ*G)=MHZbiG@zN*z~pWh6iTrPi%Mx%oM+zi7IgTde&kFNrt
z>^lj&-R>?HiwQ+h><l>0-+X_w*@*FYZ2ODFrK(0e9{*IWR$Hz!z%+9rP8tXVOtcJg
zi$2R96by=NHf#Gn<5<Qpso5bCSe9i6fiuPjthm?dbS_Yon(W=d7_-^zWImtYtX3;g
zC=|Ze>-CXz2IvU#Z8Dkk`u+Z&>2#W6O;83YZSfuo*>(aX5{U<Nr=<X#6k^3aO!~f5
zDy7ot^glboRiOa}u`E{-u+U&5faFmJHWd301z;>!0CY@lz~6b9+yTINc>rgtp}j+^
zJCb+-!1y~?+mI{9Kmru0{VM>B+#JQ+!xr|tf%a6>G*1#d$vTq04cF^6kKFr8rDCBi
zIyG^qQ%+Ykz<s+|EKZuu<`1N=$n+EHP<xV8z6PjyKA$Iu?gWrHRbRRjI63u`2Z%%>
zKf~d$&I`%&7Y_iikYBp4o6-PC`x*Q?6bc2r0w8-!G+$j^$NopD58wm*PkR(#0GLB=
URMTq|-v9sr07*qoM6N<$g4ll;3jhEB

diff --git a/res/drawable-mdpi/ic_menu_account_list.png b/res/drawable-mdpi/ic_menu_account_list.png
deleted file mode 100644
index f0945b254fa246c3ad552a3fa2ea02c53be187f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2394
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
M07*qoM6N<$f|SyB%m4rY

diff --git a/res/drawable-mdpi/ic_menu_compose.png b/res/drawable-mdpi/ic_menu_compose.png
deleted file mode 100644
index 1b4733e422d93357b61f4bfb24a4cb202b58155a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2014
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

diff --git a/res/drawable-mdpi/ic_menu_folder.png b/res/drawable-mdpi/ic_menu_folder.png
deleted file mode 100644
index f399dfc8106a383c185ecf0424366e00bb25a99e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1155
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877Y2q^y~;*F9%q3^WHFHT
z0Ash4*>)hovI56+APv^baPD1CI0FN7n5T<lNW|f{Q_p6{q>8l9|9sDS^1T+dFk$;e
z+cZ5&AD&X`=nxaxC78Hu))bB2gw+8D*SQGB{Mf2dda)_QB$7kP<e*tbY>Dz0{eno*
zqn9RZIg)kD^O&E}_kGWIoVfDr+;@q)XWy@RSAD;F-f!#Ye;d~AdiAP)`Vx8fnThfX
zJ+khsNx5%y>P%YZ;{$eaoLTpMSk5yh|L<k4*z$f`+|^Uo#qXRF7xD-$t!Lygw|m0s
ze9Zn$<+ZPQGW*|Gy<8o9{P+{@+e@0A4=%AUNO|!iHuTt((>nI{KYTS`e7wq;wENhq
zZ?~kDM_J!cTzqH#?#tgRx$_lyG}~|fZ110|mic9VvQKe~@LGnyX9}iha2#NqAYn1V
zC&ldJr(m@uT`3&<_SC%FeSUfVo9V)(+%uRs6gb)%B^@Qgx~?8~w*G%>WvNg_*tfj-
z5w{+P^L=bTJ1Kdap#!6{;F&otF6o>0fBJ3Z?ECsD`y3sY;=qM7O0#=@N#36S%8e_b
zA#sJ`%_Ng~_TI-&g_>HkerPz}%yuOI`T0Kk%b(l0SKQRS8YHxytuUr$I=7|yYF-8|
zjjoixH4jfSAGVF>=S$fT_EY;@s}SqVGyCVwireq9MsMHdKez53Y`mSEJykX@>dRlp
zEz^>B6n5rW89e&rUQ~Kqj9b-qv88MChvkuS-n_e_8jer?^Rp>+TWiv?EwYa;cE66C
z#lYj*S%0rJH}&u0ZHE@Cyjc46?#(4Gaz{Vxw{5zYTao#{Mp)>NQ0Q~dxk8$9yMHj>
z;nvC(KXK({*2^}*?QALqmEkAKj+QeW&=*<9xzUv6N4<>7(TR4F@6I?jovV*GIMq9S
zC1X}sY^)aFSL^hWg2OW&itGRMpX0B)_?FPj^slF`EV}*dqMz8x%1N)QBRDRV2ffXF
z)pO{?<@I{@mK}?>*mP*!bLEM*IG<;idoRWL<$bG9H*NLv4t9rrb6st4M)RZo<qF$7
z5)WoL&H3q5<6fyCxRuZ8?CSZ_&XzYN1a3N3olj@lr1#pX_?DwU%ADUHO=hmj*1X!x
zICs+2{$}>l?U~U_?_X%%kTO~RjIADji0+<MCc!c+=Xg`seAV4xxPRA*FD{1XXFmJf
z$MpWRx9s2Fy0YB&SnjQsTKhO5$mo*g;hc;29;vij|J$^B-L6|({;}Qn@!FNM;E5_Q
zyQ!AAMwFx^mZVxG7o`Fz1|tJQ16>0PT|<))BV#LLODiDTz}(8fAhCAqQxpxk`6-!c
zmAEwsDDXxCHSmLMNXyJANiDKU$|)^kFwip$E=jKeO7S5{<>V)&7BiTXuHaAt%1DA_
sg7ec#$`gxH85~o9k_w)=iRr09sfj6-g(p*OfQlGAUHx3vIVCg!0A3UNN&o-=

diff --git a/res/drawable-mdpi/ic_menu_forward_mail.png b/res/drawable-mdpi/ic_menu_forward_mail.png
deleted file mode 100644
index 3266e046f42cdf93c99c90675c48fef3569c162e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1489
zcmZ{keK^x=7{`CKWn-IFVqV(|S)udWkhd0NW~;23m*g#Gn;2&`Gge{Zgi<t|)9LM$
zcFM(}D=L>RDNzweUREm#DJ032!^q^E)nDiQasIgP&vQSY`+GhAJ%wym0MgLH5C8xq
zlR@L?2!1OVMAyF>kq|oQb9V;N0HEq5fvlV02N-)(b!2=mdWUfPw@c{(YJ!g6vq1N!
zqCEfrQ8H=Nknq;&u*l?)P?KowdF>h2pt+%wlFoqoW`vOJF!6oF;!4|;_#NQpAU3=p
zmU|yV<GR?gdyL=a$67A3M_2j5^t_39V}in`jfnH9)T32E2FcH)hh{tuYf1g&25E#P
zJNwS~)X?GXh=l386CaU?cueb}nwq(<J!PXryg~5RBy3d4ou#@!!T|j19&%{_cQtBR
zgiC7UMC?|Zrc<s${3Jfyj^W7Wlncq_W=qDWV=v>S*Dl|P^78A3wp7$S@?d$}gg#LH
z2E<|u%!+$I14-C=g-qqK!5pD!$~b+WCiRCv<gLwZ)*MQi!p<ybJ@P2J)O3+ESIY9!
zL(?asqe%jzeC_i%np}@4ZZEZ=uHoWg>o!ei^nfP&1;mBLWslf!Sk#W00ZeU9T3H36
z6F>oz(WCX8oUPc5f`(HAp&3128>{i5!x7qi^^!xHt67%0bOh(F%EHO*6|D+&j@(&4
zO!BxRU{6%|npf2k0a@+C*<oQ(Gkea(3xZ`9Mt<|FT%|vZGAoe-V+8()9EVZm%(=5m
zG*7OoxnA7JHqkk=edOjNU7wC0t4?33Ydl;<XQZEahyXXTar$wfZD+{|#;r3K#X#=E
zp7vDddqi0f>it4hlfhP2t=B+bNTavw)UOo;ghMg067L#x;mRR?Ikfd?y`#)398g5B
zUVF31J8WCZ>!_$V<Gn4uqL?NnBAYu^4don1|LG_-+Slg4x~d=NZi)BGP^8?Z?<`$<
zz4O9`C=OwCjDXG+Lbfx1G8kEyd`fBh_{b32d&epBw!kqQd6s81X930JDNjD;8(vDe
z9F%p<58;o;ZmxxCER|HW$t8@9Z~4na1Jn0`;&I!E6EMfdmFG7MvW2_KkI@rLF0rlP
zxc24WGxeEUJA!f;3Rl2kBjO}HaK9gFjRIGV$X5?0rSGoYq`i9o2HF%>n)XM$b#+Z0
z*Il<%gB9n_9RyMG{pxu%v{CP4!PEJ<;B`XOby4(7Dwks2?{*~+fa%c^!e?P29n!LB
zsm0onc7C8$<*8Pqk6t0Nw}roGZ0>3VgQ_5}C*1?IAL-@F*e$C<8~RKddTk8cqkC@(
zzZBY)|IG_{rxf<ck?%fW9-ME`H$Ze&e~I4)eV{J<pmJ~>8hUq3W$Dk#8B3;SFbFq=
ze5A!JoCoIEDA!iTEab6{*bf^5udaXK)i_3ui7w8qR5a8|rl*=W8k$1rmZun<BX8CK
z6|{vfr+eVHUO-Xn)ozr*rOAGI1_#UPws<zY%ePTg{|pxsBTKtxS}1iPuv#>`hfMD-
zHUAv=IcbKz)WpKT2^Y@2=(8>sc~Ev{mS5+S<-Cg2<9{^-=dt0jD^ufRJZ4>_J=l-!
z8lrei_>f5>X%ti_k!db;4e$hUKH5^F4|9}wbgpJS#&C;m-45!YLKRguu?}lB8tS6$
zdO1dQnm3PxSd*@t&=5Jw-kD{4-=XG?gtL<}o6)vZVL^e@Ls?f#nw?TxbgD?2SJ0Yo
zgnTkN=!Oh0DVt>$(Sx_^jcAPTwPGHDE31~F*1-<1swV>By3fl_;vX*I#Yy;{@nXIX
z02w5KPN2IJ$t8sB?CI>`sXK#io*)>Pd28%HffNxhQ6T&O02+(js|y%^dqI$xEa8hi
zxyfl_0Ng?fmLwd}Db&AIvWUx11zgf9VR)S}|7L<k0!ezDm=92SI*Dbb#3k@K{5YQM
TU<ZGjZV6!evuL%xu}A*_Fg<93

diff --git a/res/drawable-mdpi/ic_menu_refresh.png b/res/drawable-mdpi/ic_menu_refresh.png
deleted file mode 100644
index 77d70dd4f0534271b71ef4eb87f5a7a917d944fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2450
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
QTL1t607*qoM6N<$f*hK{82|tP

diff --git a/res/drawable-mdpi/ic_menu_reply.png b/res/drawable-mdpi/ic_menu_reply.png
deleted file mode 100644
index 41005f795050d39c71b141866244d71f11fb7c98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1864
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

diff --git a/res/drawable-mdpi/ic_menu_reply_all.png b/res/drawable-mdpi/ic_menu_reply_all.png
deleted file mode 100644
index c58584fc791a5db8e1bf91627c4b135d9b6af965..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1960
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

diff --git a/res/drawable-mdpi/ic_mms_attachment_small.png b/res/drawable-mdpi/ic_mms_attachment_small.png
deleted file mode 100644
index a661ce49de507020578772beeb30a0a2592dc4b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#`$<GWRCwC7mDx+<R}{yOiH%7*5p6Za
zYDW=_BQ+>4t%;&OR1u1}QFn0=MR3PQ|A+RW=!;8mUyBQBQbiHe2gkwP4hWr!?bN!}
zC6h)?H1>ObB%vLsIuE^Y_$}w&&;8zW&b`;=?(UBMkLDT@67t?-U{CDE?>5+9u(vQP
zOi=3T;^OjHAa|6)KJ)hWt_}zYh?B`=a(3+O?7TQWK5ntuY@7HrGTik&pie|1(HBus
zQQxMdq=fnV`#YWI=jW=KnVGL=XJ;!c7K@(Mi<L?xvFdw_8$&f(t+u_mxH#zc_Llnl
z`ws>N27X>$T{S`dM+pfDveVO3?cUzr1p5Ce#<CuxR1+H;s{_>6Xf#rHclYV~`nuk1
zHvb6N%Z-f<d1z>;zmJcPVtaere06p8;y%TKQn6U9iHnO9pok-lkB<{VAqxu&3%6RW
ze)u<jeSQ6lL?Y29B_+w`=H|>MlgS`@X!#5+DJk(iJUpc7>1nF2t|m-IDwT@gLlK7O
z=xat_8~?W#gq!HT<;Taz>q<*Y1t=0jm6esWva&)=O--wfjg4;<3IzfDxx2gjS1~a$
zUPnhqgybD!{I%%6me0_#vNEUAs;VklUS6h_mX>)ebq6t3vO;XIkIT!;v(;)fPyY7o
z?Cb|HjQ^}-K`Fj9$grUF;NXC!rlzQ-riK<57pb+ibsmX%otc@LpPQR2nV6U$OrSuu
z(BR;p1p+!T{uOT+(Ywn}Oia{4f$z!53F-BEs;#Z1g@pxbYipaoyu5s!m6erOP*C8;
zKJ=&L<YXEe8nO%z4|gJ&1K|7$yLBj*;rXQl%FE~M*VWYtv2AZ}7ogeM*?CYZWgkOR
zQ&Xw8x0j(^H#aw3U~GY9W*{r(R6dQ4j{dHqqQV!uh$bf|slLAcUr+#9sg!*TO;1m!
zzP>)o$jC?+ly-vQ*v>Wqj9C<3US1_dMMdh1iwkOQZaxnW4=01c;DqMq=L=AdDMK?d
zGN`AgM^MU8Fg7`1Fq@+ggp&$~NjTRfpr*C8weH>B-5?~%h^=b^Fb_>SIyx#0V5OMQ
z34K?oqp@NM7d0!9%jI|Y-huKql+hc8veL1!F#(EdppK4?dzCs&jQ#BfNKjy4V2nni
zaogYDe+I|Xw6wHu3JVLR9B0%m<>cg$PN#cNsk3$?A|gJ-Gd4Il`1^*2hG0KGKc{nP
zX^9V<BPdlOJQkGIqo58jSH`EXcn=Sc=QwZG?0`xuPOT**?<Y@B&uD~a69>5guC0fl
z0yr`<lAj;IK7pzDhJbP0O|aki9Jk*beEs}x|8IND{YCb>>JK|)%U;|3@6!Gh*<m-1
fJME$Nw*UhGmel}R`wOpk00000NkvXXu0mjfo*Ecx

diff --git a/res/drawable-mdpi/ind_default.png b/res/drawable-mdpi/ind_default.png
deleted file mode 100644
index 2cc970bd86bc194bc9a5bb7495464a82036538a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GH#}V&Ln>}1{rUgjp4srhfktK<hga6hhEfe(XB)2QDb%?H
zFb8bZn_$Ir<c~uQ<9fCQNu?{20w)wV+?Z4N|KDGQK68Qf<pl*lI+jETu8NS-5@DPY
zf0AVq^P`^%=1ig=okg2P-ns_e;SJ(RYA`8qVs(_e%@m@;9=e7@^gi#AsRpwh{fwHU
z&a#RA=00*J;G67(-HprkH)k_cN@Zk;OxP=O_Wb>YUHZ!0hnzWAtYq@os(iAQNp!s<
zzvYw!)~s2~OC~k$U|X?6G&`c%L?L;>{E7=lCm1?3FfvH~DZh7Mxn%{=j|`r!elF{r
G5}E*PTyvZN

diff --git a/res/drawable-mdpi/ind_sum.9.png b/res/drawable-mdpi/ind_sum.9.png
deleted file mode 100644
index f558928bb7d69499e8a15bf91885e6de7efdf1c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 674
zcmV;T0$u%yP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!L`g(JRCwB?RL_f2Q53$<tYBs`V^GUn
z3}}cyh-y<Lv{MLLBnhUQR<-VLsZ}H*ty;KIf<P%yG%0B@3z;;fhghce)RY>_Uw!9s
zl{dpgPdo7O?mhRM@11kcxkq5?WeySkW%M_LW56b`4V(csxc(>510>)FelS%N$w|N#
z3WXjflgW3YD1Mzzr!xYrNk?a7!)*^_ahPlixE6^-QiH)@T(8&XrBZ2LEEZ+ZnsjtV
zHe}0vmW0ZbH%une^;9bL)L<~|G#U*yo6U|)L8H+yi^ak^osQ`9`R=z`tvCESmV|U?
zjzl8y%x1G)?)Uqus-)NJS*22W@Av!fVfz7?X!w~f91h=cI-Qp!Nn*G!RUlip+kGV%
z4BiIEDP@%%&ml<pA}YsL5kU}Gv)SB5KzFg-({lYev)Q~e8jaXGLcaK%rS*bPH<?Vf
z0Jf%3pXwHblw)8x9LnLZBjfQ{SOlk~=LEUc?RNK3was-1d%YgD%rCj6xK658t4&II
z9l*B*j;`_!o0&}JmCNO_3M=MK6C<0=zQ*#4GQv(SmwQnt6vS1d%jff-$QK;nl!W`h
zZZsNwjLz?<ZEUiQ#bS@hmvb;-(a6a3IG-TiKp^nI>-9RcTCL`&G!fY>olft?<MAih
zrhyt2TYk$5Li(Hl&I4ENcKc0_$8*DKwQd`YM)_H_+wEbkR+Erswp=d1gz7Eu8Th@N
zHirlog`%NK-G71q;50w`&IvvOA|JK~UW1Zw&i+s2i2evL0B$^vZJZA^x&QzG07*qo
IM6N<$f_L3H$p8QV

diff --git a/res/drawable-mdpi/ind_unread.9.png b/res/drawable-mdpi/ind_unread.9.png
deleted file mode 100644
index b27cbb35ece9eed2127f93781b737084c7d29017..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 728
zcmV;}0w?{6P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!dPzh<RCwB?l;2NMQ5?X}ftwK^f|Mvh
z(SViZnD&tC=hg!(H)my*gO^^cKck2KgnDYZ)_RDo^-#^NO_nZ4KYXwj%Vh{<p%UOl
z2}Fc*@9lf=UUp@+fWF&j_ulj4bME<`9~jjh0tEh7qrWv!0vf;w7yz|co(EO|7FdS?
zxLSm}0jt;R==XZ<K9|dQz-raB(TZ4XJsAqIKmGpbW4}K#MvH(=`7El1TA*um^vvyn
zYu5AgYiTB)&7qb2M!9mYdJpPo)*`3AmArTon;aPl-h$%KKyD|Y+GJ9l8XtGx7xod`
z^x`i>cz(xxFbW0gwX`FgVir7}z>P$r@K#JmMM!hj`Rw`GN7zy7`LUL(X_XG@wTKHd
zGlQ3d*Wq&xAPTWg=kr;w=#KK;-`EV|IIbpWTSJ#{e0bP$2^`H-BnjIu3>XGKEG97_
z1l7X~^y$0UdX+lL=@5k-O=e;%6$ol1RA$arE!3@$yp|BIAz=dL=|0s-LID_Jvn5y}
zp&{Y#5|5>yW9V^$=+C5!8)`k)G$PEd@_A{4OH*c(k<GZJn{hNW<p@c@BP|!kXI~dy
znU1OK7$c18x-pP2J5`u~*JZgd^)Xl+GxuPR^MvwHJ;LyN?mO)ZuPgF>NDu3$i3i2I
zOW{(g){RZuPChK&p?yUM!mub?*AB+J;6ZcfJ~^bg>2fPNl}u&8ZNU-5hXVYUcTf3y
z@EHK2K&gC|WkULB0`>#F=EJD($Z34eWXHyqwyk58Nuq2bDzI~JgsJ7P=p__Q14}@$
za@$l1rM%KhmF|A0I6#Y7mk|Z?z=C+$ZaZF#e8JHFMfs2Z2rvK=HcYCi{BRur0000<
KMNUMnLSTXhw^YXf

diff --git a/res/layout/account_folder_list.xml b/res/layout/account_folder_list.xml
deleted file mode 100644
index 0d274779d..000000000
--- a/res/layout/account_folder_list.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <fragment
-        android:id="@+id/account_folder_list_fragment"
-        class="com.android.email.activity.AccountFolderListFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
-</LinearLayout>
diff --git a/res/layout/account_folder_list_item.xml b/res/layout/account_folder_list_item.xml
deleted file mode 100644
index f87ec3e69..000000000
--- a/res/layout/account_folder_list_item.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.email.activity.AccountFolderListItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingRight="4dip">
-    <View
-        android:id="@+id/chip"
-        android:background="@drawable/appointment_indicator_leftside_1"
-        android:layout_width="4dip"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true" />
-    <ImageView
-        android:id="@+id/folder_icon"
-        android:layout_width="30dip"
-        android:layout_height="30dip"
-        android:layout_alignParentRight="true"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="4dip"
-        android:minWidth="30dip"
-        android:src="@drawable/ic_list_folder" />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_weight="1">
-        <LinearLayout
-            android:id="@+id/subject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dip"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-            <TextView
-                android:id="@+id/name"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            <TextView
-                android:id="@+id/status"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorTertiary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-        <TextView
-            android:id="@+id/new_message_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="4dip"
-            android:background="@drawable/ind_unread"
-            style="@style/unreadCount"/>
-        <TextView
-            android:id="@+id/all_message_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="4dip"
-            android:background="@drawable/ind_sum"
-            style="@style/unreadCount"/>
-    </LinearLayout>
-    <ImageView
-        android:id="@+id/default_sender"
-        android:layout_width="12dip"
-        android:layout_height="12dip"
-        android:minWidth="12dip"
-        android:layout_margin="5dip"
-        android:src="@drawable/ind_default"/>
-    <View
-        android:id="@+id/folder_separator"
-        android:background="@color/account_folder_list_item_separator"
-        android:layout_width="1dip"
-        android:layout_height="40dip"
-        android:layout_marginLeft="5dip" />
-    <ImageView
-        android:id="@+id/folder_button"
-        android:layout_width="40dip"
-        android:layout_height="40dip"
-        android:layout_alignParentRight="true"
-        android:minWidth="30dip"
-        android:paddingTop="5dip"
-        android:paddingLeft="5dip"
-        android:src="@drawable/btn_folder"/>
-</com.android.email.activity.AccountFolderListItem>
\ No newline at end of file
diff --git a/res/layout/email_activity_one_pane.xml b/res/layout/email_activity_one_pane.xml
index 0da27c7da..3cd51049e 100644
--- a/res/layout/email_activity_one_pane.xml
+++ b/res/layout/email_activity_one_pane.xml
@@ -35,10 +35,16 @@
         android:ellipsize="end"
         android:background="#ffff66"
         />
-
     <FrameLayout
         android:id="@+id/fragment_placeholder"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        />
+    <!-- TODO temporarily gone  -->
+    <include
+        layout="@layout/message_command_button_view"
+        android:id="@+id/message_command_buttons"
+        android:visibility="gone"
         />
 </LinearLayout>
diff --git a/res/layout/mailbox_list.xml b/res/layout/mailbox_list.xml
deleted file mode 100644
index 14d5078d7..000000000
--- a/res/layout/mailbox_list.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/connection_error_banner" />
-
-    <fragment
-        android:id="@+id/mailbox_list_fragment"
-        class="com.android.email.activity.MailboxListFragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-
-</LinearLayout>
diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
deleted file mode 100644
index 3a67c6566..000000000
--- a/res/layout/message_list.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/connection_error_banner" />
-
-    <fragment
-        android:id="@+id/message_list_fragment"
-        class="com.android.email.activity.MessageListFragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-</LinearLayout>
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
deleted file mode 100644
index 089c31bd1..000000000
--- a/res/layout/message_view.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white">
-    <fragment
-        android:id="@+id/message_view_fragment"
-        class="com.android.email.activity.MessageViewFragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        />
-    <LinearLayout
-        android:id="@+id/button_panel"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="5dip"
-        android:paddingLeft="4dip"
-        android:paddingRight="4dip"
-        android:paddingBottom="1dip"
-        >
-        <Button
-            android:id="@+id/moveToNewer"
-            android:text="@string/message_view_move_to_newer"
-            android:layout_height="match_parent"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/moveToOlder"
-            android:text="@string/message_view_move_to_older"
-            android:layout_height="match_parent"
-            android:layout_width="0dip"
-            android:layout_weight="1" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/menu-xlarge/message_compose_option.xml b/res/menu-xlarge/message_compose_option.xml
deleted file mode 100644
index b011d1f67..000000000
--- a/res/menu-xlarge/message_compose_option.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- xlarge -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/send"
-        android:title="@string/send_action"
-        android:showAsAction="always|withText"
-        android:icon="@drawable/ic_menu_send_holo_light"
-        android:alphabeticShortcut="s"
-    />
-    <item
-        android:id="@+id/save"
-        android:title="@string/save_draft_action"
-        android:showAsAction="always"
-        android:alphabeticShortcut="d"
-    />
-    <item
-        android:id="@+id/discard"
-        android:title="@string/discard_action"
-        android:showAsAction="always"
-        android:icon="@drawable/ic_menu_trash_holo_light"
-        android:alphabeticShortcut="q"
-    />
-</menu>
diff --git a/res/menu/account_folder_list_context.xml b/res/menu/account_folder_list_context.xml
deleted file mode 100644
index ad91750ef..000000000
--- a/res/menu/account_folder_list_context.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/open_folder"
-        android:title="@string/open_action" />
-    <item android:id="@+id/compose"
-        android:title="@string/compose_action" />
-    <item android:id="@+id/refresh_account"
-        android:title="@string/refresh_action" />
-    <item android:id="@+id/edit_account"
-        android:title="@string/account_settings_action" />
-    <item android:id="@+id/delete_account"
-        android:title="@string/remove_account_action" />
-</menu>
diff --git a/res/menu/account_folder_list_option.xml b/res/menu/account_folder_list_option.xml
deleted file mode 100644
index 205a65ff2..000000000
--- a/res/menu/account_folder_list_option.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/compose"
-        android:alphabeticShortcut="c"
-        android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/check_mail"
-        android:alphabeticShortcut="r"
-        android:title="@string/refresh_action"
-        android:icon="@drawable/ic_menu_refresh"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/add_new_account"
-        android:title="@string/add_account_action"
-        android:icon="@android:drawable/ic_menu_add"
-    />
-    <item android:id="@+id/account_settings"
-        android:title="@string/account_settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction="ifRoom"
-    />
-    <!--
-    <item android:id="@+id/search"
-        android:title="@string/search_action" />
-    <item android:id="@+id/preferences"
-        android:title="@string/preferences_action" />
-    -->
-</menu>
diff --git a/res/menu/account_folder_list_smart_folder_context.xml b/res/menu/account_folder_list_smart_folder_context.xml
deleted file mode 100644
index 38bc15a62..000000000
--- a/res/menu/account_folder_list_smart_folder_context.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/open_folder"
-        android:title="@string/open_action" />
-    <item android:id="@+id/check_mail"
-        android:title="@string/refresh_action" />
-</menu>
diff --git a/res/menu/mailbox_list_option.xml b/res/menu/mailbox_list_option.xml
deleted file mode 100644
index 057ce5265..000000000
--- a/res/menu/mailbox_list_option.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/compose"
-        android:alphabeticShortcut="c"
-        android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/refresh"
-        android:alphabeticShortcut="r"
-        android:title="@string/refresh_action"
-        android:icon="@drawable/ic_menu_refresh"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/account_settings"
-        android:title="@string/account_settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-    />
-</menu>
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index 5beb1ef85..21c1c4d53 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -14,8 +14,6 @@
      limitations under the License.
 -->
 
-<!-- small -->
-
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/send"
diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
deleted file mode 100644
index 7b21517b6..000000000
--- a/res/menu/message_list_context.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This context menu is shown for message lists except in trash, outbox, or drafts -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/open" android:title="@string/open_action" />
-    <item android:id="@+id/delete" android:title="@string/delete_action" />
-    <item android:id="@+id/forward" android:title="@string/forward_action" />
-    <item android:id="@+id/reply_all" android:title="@string/reply_all_action" />
-    <item android:id="@+id/reply" android:title="@string/reply_action" />
-    <item android:id="@+id/mark_as_read" android:title="@string/mark_as_read_action" />
-</menu>
diff --git a/res/menu/message_list_context_drafts.xml b/res/menu/message_list_context_drafts.xml
deleted file mode 100644
index 5f6b5f9b4..000000000
--- a/res/menu/message_list_context_drafts.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This context menu is shown for drafts message lists -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/open" android:title="@string/open_action" />
-    <item android:id="@+id/delete" android:title="@string/discard_action" />
-</menu>
diff --git a/res/menu/message_list_context_outbox.xml b/res/menu/message_list_context_outbox.xml
deleted file mode 100644
index e8707329f..000000000
--- a/res/menu/message_list_context_outbox.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This context menu is shown for outbox message lists -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/open" android:title="@string/open_action" />
-    <item android:id="@+id/delete" android:title="@string/discard_action" />
-</menu>
diff --git a/res/menu/message_list_context_trash.xml b/res/menu/message_list_context_trash.xml
deleted file mode 100644
index 9ed5419d9..000000000
--- a/res/menu/message_list_context_trash.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This context menu is shown for trash message lists -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/open" android:title="@string/open_action" />
-    <item android:id="@+id/delete" android:title="@string/delete_action" />
-</menu>
diff --git a/res/menu/message_list_selection_mode.xml b/res/menu/message_list_fragment_cab_options.xml
similarity index 100%
rename from res/menu/message_list_selection_mode.xml
rename to res/menu/message_list_fragment_cab_options.xml
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
deleted file mode 100644
index f8635f477..000000000
--- a/res/menu/message_list_option.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/refresh"
-        android:alphabeticShortcut="r"
-        android:title="@string/refresh_action"
-        android:icon="@drawable/ic_menu_refresh_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/compose"
-        android:alphabeticShortcut="c"
-        android:title="@string/compose_action"
-        android:icon="@drawable/ic_menu_compose_holo_light"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/folders"
-        android:title="@string/folders_action"
-        android:icon="@drawable/ic_menu_folder"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/accounts"
-        android:title="@string/accounts_action"
-        android:icon="@drawable/ic_menu_account_list"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/account_settings"
-        android:title="@string/account_settings_action"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction="ifRoom"
-    />
-</menu>
diff --git a/res/menu/message_view_option.xml b/res/menu/message_view_option.xml
deleted file mode 100644
index 97de18e5a..000000000
--- a/res/menu/message_view_option.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/delete"
-        android:alphabeticShortcut="q"
-        android:title="@string/delete_action"
-        android:icon="@android:drawable/ic_menu_delete"
-    />
-    <item
-        android:id="@+id/forward"
-        android:alphabeticShortcut="f"
-        android:title="@string/forward_action"
-        android:icon="@drawable/ic_menu_forward_mail"
-    />
-    <item
-        android:id="@+id/reply"
-        android:alphabeticShortcut="r"
-        android:title="@string/reply_action"
-        android:icon="@drawable/ic_menu_reply"
-    />
-    <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/mark_as_unread"
-        android:alphabeticShortcut="u"
-        android:title="@string/mark_as_unread_action"
-        android:icon="@drawable/ic_menu_mark_unread_holo_light"
-    />
-</menu>
diff --git a/src/com/android/email/activity/AccountFolderList.java b/src/com/android/email/activity/AccountFolderList.java
deleted file mode 100644
index ad87b36c3..000000000
--- a/src/com/android/email/activity/AccountFolderList.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.email.Controller;
-import com.android.email.ControllerResultUiThreadWrapper;
-import com.android.email.Email;
-import com.android.email.NotificationController;
-import com.android.email.R;
-import com.android.email.activity.setup.AccountSettingsXL;
-import com.android.email.activity.setup.AccountSetupBasics;
-import com.android.emailcommon.mail.MessagingException;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.EmailContent.Mailbox;
-
-import java.util.ArrayList;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.Toast;
-
-public class AccountFolderList extends Activity implements AccountFolderListFragment.Callback {
-    private static final int DIALOG_REMOVE_ACCOUNT = 1;
-
-    private static final String ICICLE_SELECTED_ACCOUNT = "com.android.email.selectedAccount";
-    private EmailContent.Account mSelectedContextAccount;
-
-    // UI Support
-    private AccountFolderListFragment mListFragment;
-
-    private Controller.Result mControllerCallback;
-
-    /**
-     * Start the Accounts list activity.  Uses the CLEAR_TOP flag which means that other stacked
-     * activities may be killed in order to get back to Accounts.
-     */
-    public static void actionShowAccounts(Context context) {
-        Intent i = new Intent(context, AccountFolderList.class);
-        i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        context.startActivity(i);
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        ActivityHelper.debugSetWindowFlags(this);
-
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setContentView(R.layout.account_folder_list);
-
-        mControllerCallback = new ControllerResultUiThreadWrapper<ControllerResults>(
-                new Handler(), new ControllerResults());
-        mListFragment =
-                (AccountFolderListFragment) getFragmentManager()
-                .findFragmentById(R.id.account_folder_list_fragment);
-        mListFragment.bindActivityInfo(this);
-
-        if (icicle != null && icicle.containsKey(ICICLE_SELECTED_ACCOUNT)) {
-            mSelectedContextAccount = (Account) icicle.getParcelable(ICICLE_SELECTED_ACCOUNT);
-        }
-
-        // Halt the progress indicator (we'll display it later when needed)
-        setProgressBarIndeterminate(true);
-        setProgressBarIndeterminateVisibility(false);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (mSelectedContextAccount != null) {
-            outState.putParcelable(ICICLE_SELECTED_ACCOUNT, mSelectedContextAccount);
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        Controller.getInstance(getApplication()).removeResultCallback(mControllerCallback);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        NotificationManager notifMgr = (NotificationManager)
-                getSystemService(Context.NOTIFICATION_SERVICE);
-        notifMgr.cancel(1);
-
-        Controller.getInstance(getApplication()).addResultCallback(mControllerCallback);
-
-        // Exit immediately if the accounts list has changed (e.g. externally deleted)
-        if (Email.getNotifyUiAccountsChanged()) {
-            Welcome.actionStart(this);
-            finish();
-            return;
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
-    private void onAddNewAccount() {
-        AccountSetupBasics.actionNewAccount(this);
-    }
-
-    /* Implements AccountFolderListFragment.Callback */
-    public void onEditAccount(long accountId) {
-        AccountSettingsXL.actionSettings(this, -1);
-    }
-
-    /* Implements AccountFolderListFragment.Callback */
-    public void onRefresh(long accountId) {
-        if (accountId == -1) {
-            // TODO implement a suitable "Refresh all accounts" / "check mail" comment in Controller
-            // TODO this is temp
-            Toast.makeText(this, getString(R.string.account_folder_list_refresh_toast),
-                    Toast.LENGTH_LONG).show();
-        } else {
-            showProgressIcon(true);
-            Controller.getInstance(getApplication()).updateMailboxList(accountId);
-            // TODO update the inbox too
-        }
-    }
-
-    /* Implements AccountFolderListFragment.Callback */
-    public void onCompose(long accountId) {
-        if (accountId == -1) {
-            accountId = Account.getDefaultAccountId(this);
-        }
-        if (accountId != -1) {
-            MessageCompose.actionCompose(this, accountId);
-        } else {
-            onAddNewAccount();
-        }
-    }
-
-    /* Implements AccountFolderListFragment.Callback */
-    public void onDeleteAccount(long accountId) {
-        mSelectedContextAccount = Account.restoreAccountWithId(this, accountId);
-        showDialog(DIALOG_REMOVE_ACCOUNT);
-    }
-
-    /* Implements AccountFolderListFragment.Callback */
-    public void onOpenAccount(long accountId) {
-        MessageList.actionHandleAccount(this, accountId, Mailbox.TYPE_INBOX);
-    }
-
-    /* Implements AccountFolderListFragment.Callback */
-    public void onOpenMailbox(long mailboxId) {
-        MessageList.actionHandleMailbox(this, mailboxId);
-    }
-
-    /* Implements AccountFolderListFragment.Callback */
-    public void onOpenMailboxes(long accountId) {
-        MailboxList.actionHandleAccount(this, accountId);
-    }
-
-    @Override
-    public Dialog onCreateDialog(int id, Bundle args) {
-        switch (id) {
-            case DIALOG_REMOVE_ACCOUNT:
-                return createRemoveAccountDialog();
-        }
-        return super.onCreateDialog(id, args);
-    }
-
-    private Dialog createRemoveAccountDialog() {
-        final Activity activity = this;
-        return new AlertDialog.Builder(this)
-            .setIconAttribute(android.R.attr.alertDialogIcon)
-            .setTitle(R.string.account_delete_dlg_title)
-            .setMessage(getString(R.string.account_delete_dlg_instructions_fmt,
-                    mSelectedContextAccount.getDisplayName()))
-            .setPositiveButton(R.string.okay_action, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int whichButton) {
-                    final long accountId = mSelectedContextAccount.mId;
-                    dismissDialog(DIALOG_REMOVE_ACCOUNT);
-                    // TODO Do this automatically in the NotificationController as part of a
-                    // ContentObserver
-                    // Dismiss new message notification.
-                    NotificationController.getInstance(activity)
-                            .cancelNewMessageNotification(accountId);
-                    int numAccounts = EmailContent.count(activity,
-                            Account.CONTENT_URI, null, null);
-                    mListFragment.hideDeletingAccount(mSelectedContextAccount.mId);
-
-                    Controller.getInstance(activity).deleteAccount(accountId);
-                    if (numAccounts == 1) {
-                        AccountSetupBasics.actionNewAccount(activity);
-                        finish();
-                    }
-                }
-            })
-            .setNegativeButton(R.string.cancel_action, new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int whichButton) {
-                    dismissDialog(DIALOG_REMOVE_ACCOUNT);
-                }
-            })
-            .create();
-    }
-
-    /**
-     * Update a cached dialog with current values (e.g. account name)
-     */
-    @Override
-    public void onPrepareDialog(int id, Dialog dialog, Bundle args) {
-        switch (id) {
-            case DIALOG_REMOVE_ACCOUNT:
-                AlertDialog alert = (AlertDialog) dialog;
-                alert.setMessage(getString(R.string.account_delete_dlg_instructions_fmt,
-                        mSelectedContextAccount.getDisplayName()));
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.add_new_account:
-                onAddNewAccount();
-                break;
-            case R.id.check_mail:
-                onRefresh(-1);
-                break;
-            case R.id.compose:
-                onCompose(-1);
-                break;
-            case R.id.account_settings:
-                onEditAccount(-1);
-                break;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-        return true;
-    }
-
-    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-        return true;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.account_folder_list_option, menu);
-        return true;
-    }
-
-    private void showProgressIcon(boolean show) {
-        setProgressBarIndeterminateVisibility(show);
-    }
-
-    /**
-     * Controller results listener.  We wrap it with {@link ControllerResultUiThreadWrapper},
-     * so all methods are called on the UI thread.
-     */
-    private class ControllerResults extends Controller.Result {
-        @Override
-        public void updateMailboxListCallback(MessagingException result, long accountKey,
-                int progress) {
-            updateProgress(result, progress);
-        }
-
-        @Override
-        public void updateMailboxCallback(MessagingException result, long accountKey,
-                long mailboxKey, int progress, int numNewMessages,
-                ArrayList<Long> addedMessages) {
-            updateProgress(result, progress);
-        }
-
-        @Override
-        public void serviceCheckMailCallback(MessagingException result, long accountId,
-                long mailboxId, int progress, long tag) {
-            updateProgress(result, progress);
-        }
-
-        @Override
-        public void sendMailCallback(MessagingException result, long accountId, long messageId,
-                int progress) {
-        }
-
-        private void updateProgress(MessagingException result, int progress) {
-            showProgressIcon(result == null && progress < 100);
-        }
-    }
-}
diff --git a/src/com/android/email/activity/AccountFolderListFragment.java b/src/com/android/email/activity/AccountFolderListFragment.java
deleted file mode 100644
index 6fb28dc70..000000000
--- a/src/com/android/email/activity/AccountFolderListFragment.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.email.Controller;
-import com.android.email.ControllerResultUiThreadWrapper;
-import com.android.email.R;
-import com.android.emailcommon.mail.MessagingException;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.EmailContent.Mailbox;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.EmailContent.MessageColumns;
-import com.android.emailcommon.utility.Utility;
-
-import java.util.ArrayList;
-
-import android.app.Activity;
-import android.app.ListFragment;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.MatrixCursor.RowBuilder;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.CursorAdapter;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-
-public class AccountFolderListFragment extends ListFragment
-        implements OnItemClickListener, AccountsAdapter.Callback  {
-
-    // UI Support
-    private Activity mActivity;
-    private ListView mListView;
-    private Callback mCallback;
-
-    // Tasks and Data
-    private AccountsAdapter mListAdapter;
-    private LoadAccountsTask mLoadAccountsTask;
-    private Controller.Result mControllerCallback;
-
-    private static final String FAVORITE_COUNT_SELECTION =
-        MessageColumns.FLAG_FAVORITE + "= 1";
-    private static final String MAILBOX_TYPE_SELECTION =
-        MailboxColumns.TYPE + " =?";
-    private static final String MAILBOX_ID_SELECTION =
-        MessageColumns.MAILBOX_KEY + " =?";
-    private static final String[] MAILBOX_SUM_OF_UNREAD_COUNT_PROJECTION = new String [] {
-        "sum(" + MailboxColumns.UNREAD_COUNT + ")"
-    };
-
-    /**
-     * Callback interface that owning activities must implement
-     */
-    public interface Callback {
-        /** Called when the user clicks on a specific account */
-        public void onOpenAccount(long accountId);
-        /** Called when the user clicks on a specific (currently, only magic mailbox) */
-        public void onOpenMailbox(long mailboxId);
-        /** Called when the user clicks to open the mailbox list for a specific account */
-        public void onOpenMailboxes(long accountId);
-        /** Begin composing a message in a specific account, or -1 for the default account */
-        public void onCompose(long accountId);
-        /** Begin refreshing a specific account, or -1 for all accounts */
-        public void onRefresh(long accountId);
-        /** Begin edit settings for a specific account */
-        public void onEditAccount(long accountId);
-        /** Delete a specific account */
-        public void onDeleteAccount(long accountId);
-    }
-
-    /**
-     * Called to do initial creation of a fragment.  This is called after
-     * {@link #onAttach(Activity)} and before {@link #onActivityCreated(Bundle)}.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    /**
-     * Called by activity during onCreate() to bind additional information
-     * @param callback if non-null, UI clicks (e.g. refresh or open) will be delivered here
-     */
-    public void bindActivityInfo(Callback callback) {
-        mCallback = callback;
-    }
-
-    /**
-     * Called when the fragment is instantiated, but not yet displayed.
-     */
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        mActivity = getActivity();
-
-        mListView = getListView();
-        mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
-        mListView.setOnItemClickListener(this);
-        mListView.setLongClickable(true);
-        registerForContextMenu(mListView);
-
-        mControllerCallback = new ControllerResultUiThreadWrapper<ControllerResults>(
-                new Handler(), new ControllerResults());
-    }
-
-    /**
-     * Called when the Fragment is visible to the user.
-     */
-    @Override
-    public void onStart() {
-        super.onStart();
-    }
-
-    /**
-     * Called when the fragment is visible to the user and actively running.
-     */
-    @Override
-    public void onResume() {
-        super.onResume();
-        Controller.getInstance(mActivity).addResultCallback(mControllerCallback);
-        updateAccounts();
-    }
-
-    /**
-     * Called when the fragment is no longer displayed
-     */
-    @Override
-    public void onPause() {
-        super.onPause();
-        Controller.getInstance(mActivity).removeResultCallback(mControllerCallback);
-    }
-
-    /**
-     * Called when the Fragment is no longer started.
-     */
-    @Override
-    public void onStop() {
-        super.onStop();
-        Utility.cancelTaskInterrupt(mLoadAccountsTask);
-        mLoadAccountsTask = null;
-    }
-
-    /**
-     * Called when the fragment is no longer in use.
-     */
-   @Override
-   public void onDestroy() {
-        super.onDestroy();
-        if (mListAdapter != null) {
-            mListAdapter.changeCursor(null);
-        }
-   }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo info) {
-        super.onCreateContextMenu(menu, v, info);
-        AdapterView.AdapterContextMenuInfo menuInfo = (AdapterView.AdapterContextMenuInfo) info;
-        if (mListAdapter.isMailbox(menuInfo.position)) {
-            Cursor c = (Cursor) mListView.getItemAtPosition(menuInfo.position);
-            String displayName = c.getString(Account.CONTENT_DISPLAY_NAME_COLUMN);
-            menu.setHeaderTitle(displayName);
-            mActivity.getMenuInflater()
-                    .inflate(R.menu.account_folder_list_smart_folder_context, menu);
-        } else if (mListAdapter.isAccount(menuInfo.position)) {
-            Cursor c = (Cursor) mListView.getItemAtPosition(menuInfo.position);
-            String accountName = c.getString(Account.CONTENT_DISPLAY_NAME_COLUMN);
-            menu.setHeaderTitle(accountName);
-            mActivity.getMenuInflater().inflate(R.menu.account_folder_list_context, menu);
-        }
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        AdapterView.AdapterContextMenuInfo menuInfo =
-            (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
-
-        // Drop the event if there's nowhere to send it (it's probably late-arriving)
-        if (mCallback == null) {
-            return false;
-        }
-
-        if (mListAdapter.isMailbox(menuInfo.position)) {
-            Cursor c = (Cursor) mListView.getItemAtPosition(menuInfo.position);
-            long id = c.getLong(AccountsAdapter.MAILBOX_COLUMN_ID);
-            switch (item.getItemId()) {
-                case R.id.open_folder:
-                    mCallback.onOpenMailbox(id);
-                    break;
-                case R.id.check_mail:
-                    mCallback.onRefresh(-1);
-                    break;
-            }
-            return false;
-        } else if (mListAdapter.isAccount(menuInfo.position)) {
-            Cursor c = (Cursor) mListView.getItemAtPosition(menuInfo.position);
-            long accountId = c.getLong(Account.CONTENT_ID_COLUMN);
-            switch (item.getItemId()) {
-                case R.id.open_folder:
-                    mCallback.onOpenAccount(accountId);
-                    break;
-                case R.id.compose:
-                    mCallback.onCompose(accountId);
-                    break;
-                case R.id.refresh_account:
-                    mCallback.onRefresh(accountId);
-                    break;
-                case R.id.edit_account:
-                    mCallback.onEditAccount(accountId);
-                    break;
-                case R.id.delete_account:
-                    mCallback.onDeleteAccount(accountId);
-                    break;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /* Implements OnItemClickListener.onItemClick */
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        // Drop the event if there's nowhere to send it (it's probably late-arriving)
-        if (mCallback == null) {
-            return;
-        }
-
-        if (mListAdapter.isMailbox(position)) {
-            mCallback.onOpenMailbox(id);
-        } else if (mListAdapter.isAccount(position)) {
-            mCallback.onOpenAccount(id);
-        }
-    }
-
-    /* Implements AccountsAdapter.Controller */
-    public void onClickAccountFolders(long accountId) {
-        if (mCallback != null) {
-            mCallback.onOpenMailboxes(accountId);
-        }
-    }
-
-    /**
-     * Trigger accounts list reload
-     */
-    private void updateAccounts() {
-        Utility.cancelTaskInterrupt(mLoadAccountsTask);
-        mLoadAccountsTask = (LoadAccountsTask) new LoadAccountsTask().execute();
-    }
-
-    /**
-     * Called by container to mark an account as "being deleted" (we quickly hide it)
-     */
-    public void hideDeletingAccount(long accountId) {
-        mListAdapter.addOnDeletingAccount(accountId);
-    }
-
-    private static int getUnreadCountByMailboxType(Context context, int type) {
-        int count = 0;
-        Cursor c = context.getContentResolver().query(Mailbox.CONTENT_URI,
-                MAILBOX_SUM_OF_UNREAD_COUNT_PROJECTION,
-                MAILBOX_TYPE_SELECTION,
-                new String[] { String.valueOf(type) }, null);
-
-        try {
-            if (c.moveToFirst()) {
-                return c.getInt(0);
-            }
-        } finally {
-            c.close();
-        }
-        return count;
-    }
-
-    private static int getCountByMailboxType(Context context, int type) {
-        int count = 0;
-        Cursor c = context.getContentResolver().query(Mailbox.CONTENT_URI,
-                EmailContent.ID_PROJECTION, MAILBOX_TYPE_SELECTION,
-                new String[] { String.valueOf(type) }, null);
-
-        try {
-            c.moveToPosition(-1);
-            while (c.moveToNext()) {
-                count += EmailContent.count(context, Message.CONTENT_URI,
-                        MAILBOX_ID_SELECTION,
-                        new String[] {
-                            String.valueOf(c.getLong(EmailContent.ID_PROJECTION_COLUMN)) });
-            }
-        } finally {
-            c.close();
-        }
-        return count;
-    }
-
-    /**
-     * Build the group and child cursors that support the summary views (aka "at a glance").
-     *
-     * This is a placeholder implementation with significant problems that need to be addressed:
-     *
-     * TODO: We should only show summary mailboxes if they are non-empty.  So there needs to be
-     * a more dynamic child-cursor here, probably listening for update notifications on a number
-     * of other internally-held queries such as count-of-inbox, count-of-unread, etc.
-     *
-     * TODO: This simple list is incomplete.  For example, we probably want drafts, outbox, and
-     * (maybe) sent (again, these would be displayed only when non-empty).
-     *
-     * TODO: We need a way to count total unread in all inboxes (probably with some provider help)
-     *
-     * TODO: We need a way to count total # messages in all other summary boxes (probably with
-     * some provider help).
-     *
-     * TODO use narrower account projection (see LoadAccountsTask)
-     */
-    private MatrixCursor getSummaryChildCursor() {
-        MatrixCursor childCursor = new MatrixCursor(AccountsAdapter.MAILBOX_PROJECTION);
-        int count;
-        RowBuilder row;
-        // TYPE_INBOX
-        count = getUnreadCountByMailboxType(mActivity, Mailbox.TYPE_INBOX);
-        row = childCursor.newRow();
-        row.add(Long.valueOf(Mailbox.QUERY_ALL_INBOXES));           // MAILBOX_COLUMN_ID = 0;
-                                                                    // MAILBOX_DISPLAY_NAME
-        row.add(mActivity.getString(R.string.account_folder_list_summary_inbox));
-        row.add(null);                                              // MAILBOX_ACCOUNT_KEY = 2;
-        row.add(Integer.valueOf(Mailbox.TYPE_INBOX));               // MAILBOX_TYPE = 3;
-        row.add(Integer.valueOf(count));                            // MAILBOX_UNREAD_COUNT = 4;
-        // TYPE_MAIL (FAVORITES)
-        count = EmailContent.count(mActivity, Message.CONTENT_URI, FAVORITE_COUNT_SELECTION, null);
-        if (count > 0) {
-            row = childCursor.newRow();
-            row.add(Long.valueOf(Mailbox.QUERY_ALL_FAVORITES));     // MAILBOX_COLUMN_ID = 0;
-                                                                    // MAILBOX_DISPLAY_NAME
-            row.add(mActivity.getString(R.string.account_folder_list_summary_starred));
-            row.add(null);                                          // MAILBOX_ACCOUNT_KEY = 2;
-            row.add(Integer.valueOf(Mailbox.TYPE_MAIL));            // MAILBOX_TYPE = 3;
-            row.add(Integer.valueOf(count));                        // MAILBOX_UNREAD_COUNT = 4;
-        }
-        // TYPE_DRAFTS
-        count = getCountByMailboxType(mActivity, Mailbox.TYPE_DRAFTS);
-        if (count > 0) {
-            row = childCursor.newRow();
-            row.add(Long.valueOf(Mailbox.QUERY_ALL_DRAFTS));        // MAILBOX_COLUMN_ID = 0;
-                                                                    // MAILBOX_DISPLAY_NAME
-            row.add(mActivity.getString(R.string.account_folder_list_summary_drafts));
-            row.add(null);                                          // MAILBOX_ACCOUNT_KEY = 2;
-            row.add(Integer.valueOf(Mailbox.TYPE_DRAFTS));          // MAILBOX_TYPE = 3;
-            row.add(Integer.valueOf(count));                        // MAILBOX_UNREAD_COUNT = 4;
-        }
-        // TYPE_OUTBOX
-        count = getCountByMailboxType(mActivity, Mailbox.TYPE_OUTBOX);
-        if (count > 0) {
-            row = childCursor.newRow();
-            row.add(Long.valueOf(Mailbox.QUERY_ALL_OUTBOX));        // MAILBOX_COLUMN_ID = 0;
-                                                                    // MAILBOX_DISPLAY_NAME
-            row.add(mActivity.getString(R.string.account_folder_list_summary_outbox));
-            row.add(null);                                          // MAILBOX_ACCOUNT_KEY = 2;
-            row.add(Integer.valueOf(Mailbox.TYPE_OUTBOX));          // MAILBOX_TYPE = 3;
-            row.add(Integer.valueOf(count));                        // MAILBOX_UNREAD_COUNT = 4;
-        }
-        return childCursor;
-    }
-
-    /**
-     * Async task to handle the accounts query outside of the UI thread
-     */
-    private class LoadAccountsTask extends AsyncTask<Void, Void, Object[]> {
-        @Override
-        protected Object[] doInBackground(Void... params) {
-            // Create the summaries cursor
-            Cursor c1 = null;
-            Cursor c2 = null;
-            Long defaultAccount = null;
-            if (!isCancelled()) {
-                // Create the summaries cursor
-                c1 = getSummaryChildCursor();
-            }
-
-            if (!isCancelled()) {
-                // TODO use a custom projection and don't have to sample all of these columns
-                c2 = mActivity.getContentResolver().query(
-                        EmailContent.Account.CONTENT_URI,
-                        EmailContent.Account.CONTENT_PROJECTION, null, null, null);
-            }
-
-            if (!isCancelled()) {
-                defaultAccount = Account.getDefaultAccountId(mActivity);
-            }
-
-            if (isCancelled()) {
-                if (c1 != null) c1.close();
-                if (c2 != null) c2.close();
-                return null;
-            }
-            return new Object[] { c1, c2 , defaultAccount};
-        }
-
-        @Override
-        protected void onPostExecute(Object[] params) {
-            if (isCancelled() || params == null) {
-                if (params != null) {
-                    Cursor c1 = (Cursor)params[0];
-                    if (c1 != null) {
-                        c1.close();
-                    }
-                    Cursor c2 = (Cursor)params[1];
-                    if (c2 != null) {
-                        c2.close();
-                    }
-                }
-                return;
-            }
-            // Before writing a new list adapter into the listview, we need to
-            // shut down the old one (if any).
-            ListAdapter oldAdapter = mListView.getAdapter();
-            if (oldAdapter != null && oldAdapter instanceof CursorAdapter) {
-                ((CursorAdapter)oldAdapter).changeCursor(null);
-            }
-            // Now create a new list adapter and install it
-            mListAdapter = AccountsAdapter.getInstance((Cursor)params[0], (Cursor)params[1],
-                    mActivity, (Long)params[2], AccountFolderListFragment.this);
-            setListAdapter(mListAdapter);
-        }
-    }
-
-    /**
-     * Controller results listener.  We wrap it with {@link ControllerResultUiThreadWrapper},
-     * so all methods are called on the UI thread.
-     */
-    private class ControllerResults extends Controller.Result {
-        @Override
-        public void updateMailboxCallback(MessagingException result, long accountKey,
-                long mailboxKey, int progress, int numNewMessages,
-                ArrayList<Long> addedMessages) {
-            if (progress == 100) {
-                updateAccounts();
-            }
-        }
-
-        @Override
-        public void sendMailCallback(MessagingException result, long accountId, long messageId,
-                int progress) {
-            if (progress == 100) {
-                updateAccounts();
-            }
-        }
-
-        @Override
-        public void deleteAccountCallback(long accountId) {
-            updateAccounts();
-        }
-    }
-
-}
diff --git a/src/com/android/email/activity/AccountFolderListItem.java b/src/com/android/email/activity/AccountFolderListItem.java
deleted file mode 100644
index 047911700..000000000
--- a/src/com/android/email/activity/AccountFolderListItem.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.email.R;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.widget.LinearLayout;
-
-/**
- * This custom View is the list item for the AccountFolderList activity, and serves two purposes:
- * 1.  It's a container to store row metadata
- * 2.  It handles internal clicks so we can create virtual "buttons" in the list
- */
-public class AccountFolderListItem extends LinearLayout {
-
-    public long mAccountId;
-
-    private AccountsAdapter mAdapter;
-
-    private boolean mHasFolderButton;
-    private boolean mDownEvent;
-    private boolean mCachedViewPositions;
-    private int mFolderLeft;
-
-    private final static float FOLDER_PAD = 5.0F;
-
-    public AccountFolderListItem(Context context) {
-        super(context);
-    }
-
-    public AccountFolderListItem(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    /**
-     * Called by the adapter at bindView() time
-     * 
-     * @param adapter the adapter that creates this view
-     */
-    public void bindViewInit(AccountsAdapter adapter, boolean hasFolderButton) {
-        mAdapter = adapter;
-        mCachedViewPositions = false;
-        mHasFolderButton = hasFolderButton;
-    }
-
-    /**
-     * Overriding this method allows us to "catch" clicks in the checkbox or star
-     * and process them accordingly.
-     */
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (mAdapter.isOnDeletingAccountView(mAccountId)) {
-            return true;
-        }
-
-        // Short-circuit all of this for list items w/o folder buttons
-        if (!mHasFolderButton) {
-            return super.onTouchEvent(event);
-        }
-
-        boolean handled = false;
-        int touchX = (int) event.getX();
-
-        if (!mCachedViewPositions) {
-            float paddingScale = getContext().getResources().getDisplayMetrics().density;
-            int folderPadding = (int) ((FOLDER_PAD * paddingScale) + 0.5);
-            mFolderLeft = findViewById(R.id.folder_button).getLeft() - folderPadding;
-            mCachedViewPositions = true;
-        }
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                mDownEvent = true;
-                if (touchX > mFolderLeft) {
-                    handled = true;
-                }
-                break;
-
-            case MotionEvent.ACTION_CANCEL:
-                mDownEvent = false;
-                break;
-
-            case MotionEvent.ACTION_UP:
-                if (mDownEvent) {
-                    if (touchX > mFolderLeft) {
-                        mAdapter.onClickFolder(this);
-                        handled = true;
-                    }
-                }
-                break;
-        }
-
-        if (handled) {
-            postInvalidate();
-        } else {
-            handled = super.onTouchEvent(event);
-        }
-
-        return handled;
-    }
-}
diff --git a/src/com/android/email/activity/AccountsAdapter.java b/src/com/android/email/activity/AccountsAdapter.java
deleted file mode 100644
index 05a4afe9e..000000000
--- a/src/com/android/email/activity/AccountsAdapter.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.email.FolderProperties;
-import com.android.email.R;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.EmailContent.Mailbox;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.MergeCursor;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-
-/**
- * Adapter that presents a combined list of smart mailboxes (e.g. combined inbox, all drafts, etc),
- * a non-selectable separator, and the list of accounts.
- */
-public class AccountsAdapter extends CursorAdapter {
-
-    /**
-     * Reduced mailbox projection used by AccountsAdapter
-     */
-    public final static String[] MAILBOX_PROJECTION = new String[] {
-        EmailContent.RECORD_ID, MailboxColumns.DISPLAY_NAME,
-        MailboxColumns.ACCOUNT_KEY, MailboxColumns.TYPE,
-        MailboxColumns.UNREAD_COUNT,
-        MailboxColumns.FLAG_VISIBLE, MailboxColumns.FLAGS
-    };
-    public final static int MAILBOX_COLUMN_ID = 0;
-    public final static int MAILBOX_DISPLAY_NAME = 1;
-    public final static int MAILBOX_ACCOUNT_KEY = 2;
-    public final static int MAILBOX_TYPE = 3;
-    public final static int MAILBOX_UNREAD_COUNT = 4;
-    public final static int MAILBOX_FLAG_VISIBLE = 5;
-    public final static int MAILBOX_FLAGS = 6;
-
-    private static final String[] MAILBOX_UNREAD_COUNT_PROJECTION = new String [] {
-        MailboxColumns.UNREAD_COUNT
-    };
-    private static final int MAILBOX_UNREAD_COUNT_COLUMN_UNREAD_COUNT = 0;
-
-    private static final String MAILBOX_INBOX_SELECTION =
-        MailboxColumns.ACCOUNT_KEY + " =?" + " AND " + MailboxColumns.TYPE +" = "
-        + Mailbox.TYPE_INBOX;
-
-    private final LayoutInflater mInflater;
-    private final int mMailboxesCount;
-    private final int mSeparatorPosition;
-    private final long mDefaultAccountId;
-    private final ArrayList<Long> mOnDeletingAccounts = new ArrayList<Long>();
-    private Callback mCallback;
-
-    public static AccountsAdapter getInstance(Cursor mailboxesCursor, Cursor accountsCursor,
-            Context context, long defaultAccountId, Callback callback) {
-        Cursor[] cursors = new Cursor[] { mailboxesCursor, accountsCursor };
-        Cursor mc = new MergeCursor(cursors);
-        return new AccountsAdapter(mc, context, mailboxesCursor.getCount(), defaultAccountId,
-                callback);
-    }
-
-    private AccountsAdapter(Cursor c, Context context, int mailboxesCount, long defaultAccountId,
-            Callback callback) {
-        super(context, c, true);
-        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mMailboxesCount = mailboxesCount;
-        mSeparatorPosition = mailboxesCount;
-        mDefaultAccountId = defaultAccountId;
-        mCallback = callback;
-    }
-
-    /**
-     * When changeCursor(null) is called, drop reference(s) to make sure we don't leak the activity
-     */
-    @Override
-    public void changeCursor(Cursor cursor) {
-        super.changeCursor(cursor);
-        if (cursor == null) {
-            mCallback = null;
-        }
-    }
-
-    /**
-     * Callback interface used to report clicks other than the basic list item click or longpress.
-     */
-    public interface Callback {
-        /**
-         * Callback for clicks on the "folder" icon (to open MailboxList)
-         */
-        public void onClickAccountFolders(long accountId);
-    }
-
-    public boolean isMailbox(int position) {
-        return position < mMailboxesCount;
-    }
-
-    public boolean isAccount(int position) {
-        return position > mMailboxesCount;
-    }
-
-    public void addOnDeletingAccount(long accountId) {
-        mOnDeletingAccounts.add(accountId);
-    }
-
-    public boolean isOnDeletingAccountView(long accountId) {
-        return mOnDeletingAccounts.contains(accountId);
-    }
-
-    /**
-     * This is an entry point called by the list item for clicks in the folder "button"
-     *
-     * @param itemView the item in which the click occurred
-     */
-    public void onClickFolder(AccountFolderListItem itemView) {
-        if (mCallback != null) {
-            mCallback.onClickAccountFolders(itemView.mAccountId);
-        }
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        if (cursor.getPosition() < mMailboxesCount) {
-            bindMailboxItem(view, context, cursor, false);
-        } else {
-            bindAccountItem(view, context, cursor, false);
-        }
-    }
-
-    private void bindMailboxItem(View view, Context context, Cursor cursor, boolean isLastChild)
-            {
-        // Reset the view (in case it was recycled) and prepare for binding
-        AccountFolderListItem itemView = (AccountFolderListItem) view;
-        itemView.bindViewInit(this, false);
-
-        // Invisible (not "gone") to maintain spacing
-        view.findViewById(R.id.chip).setVisibility(View.INVISIBLE);
-
-        String text = cursor.getString(MAILBOX_DISPLAY_NAME);
-        if (text != null) {
-            TextView nameView = (TextView) view.findViewById(R.id.name);
-            nameView.setText(text);
-        }
-
-        // TODO get/track live folder status
-        text = null;
-        TextView statusView = (TextView) view.findViewById(R.id.status);
-        if (text != null) {
-            statusView.setText(text);
-            statusView.setVisibility(View.VISIBLE);
-        } else {
-            statusView.setVisibility(View.GONE);
-        }
-
-        int count = -1;
-        text = cursor.getString(MAILBOX_UNREAD_COUNT);
-        if (text != null) {
-            count = Integer.valueOf(text);
-        }
-        TextView unreadCountView = (TextView) view.findViewById(R.id.new_message_count);
-        TextView allCountView = (TextView) view.findViewById(R.id.all_message_count);
-        int id = cursor.getInt(MAILBOX_COLUMN_ID);
-        // If the unread count is zero, not to show countView.
-        if (count > 0) {
-            if (id == Mailbox.QUERY_ALL_FAVORITES
-                    || id == Mailbox.QUERY_ALL_DRAFTS
-                    || id == Mailbox.QUERY_ALL_OUTBOX) {
-                unreadCountView.setVisibility(View.GONE);
-                allCountView.setVisibility(View.VISIBLE);
-                allCountView.setText(text);
-            } else {
-                allCountView.setVisibility(View.GONE);
-                unreadCountView.setVisibility(View.VISIBLE);
-                unreadCountView.setText(text);
-            }
-        } else {
-            allCountView.setVisibility(View.GONE);
-            unreadCountView.setVisibility(View.GONE);
-        }
-
-        view.findViewById(R.id.folder_button).setVisibility(View.GONE);
-        view.findViewById(R.id.folder_separator).setVisibility(View.GONE);
-        view.findViewById(R.id.default_sender).setVisibility(View.GONE);
-        view.findViewById(R.id.folder_icon).setVisibility(View.VISIBLE);
-        ((ImageView)view.findViewById(R.id.folder_icon)).setImageDrawable(
-                FolderProperties.getInstance(context).getSummaryMailboxIconIds(id));
-    }
-
-    private void bindAccountItem(View view, Context context, Cursor cursor, boolean isExpanded)
-            {
-        // Reset the view (in case it was recycled) and prepare for binding
-        AccountFolderListItem itemView = (AccountFolderListItem) view;
-        itemView.bindViewInit(this, true);
-        itemView.mAccountId = cursor.getLong(Account.CONTENT_ID_COLUMN);
-
-        long accountId = cursor.getLong(Account.CONTENT_ID_COLUMN);
-
-        // No color chip for now.  TODO Revisit for phone UI
-        view.findViewById(R.id.chip).setVisibility(View.GONE);
-
-        String text = cursor.getString(Account.CONTENT_DISPLAY_NAME_COLUMN);
-        if (text != null) {
-            TextView descriptionView = (TextView) view.findViewById(R.id.name);
-            descriptionView.setText(text);
-        }
-
-        text = cursor.getString(Account.CONTENT_EMAIL_ADDRESS_COLUMN);
-        if (text != null) {
-            TextView emailView = (TextView) view.findViewById(R.id.status);
-            emailView.setText(text);
-            emailView.setVisibility(View.VISIBLE);
-        }
-
-        // TODO: We should not be doing a query inside bindAccountItem
-        int unreadMessageCount = 0;
-        Cursor c = context.getContentResolver().query(Mailbox.CONTENT_URI,
-                MAILBOX_UNREAD_COUNT_PROJECTION,
-                MAILBOX_INBOX_SELECTION,
-                new String[] { String.valueOf(accountId) }, null);
-
-        try {
-            if (c.moveToFirst()) {
-                String count = c.getString(MAILBOX_UNREAD_COUNT_COLUMN_UNREAD_COUNT);
-                if (count != null) {
-                    unreadMessageCount = Integer.valueOf(count);
-                }
-            }
-        } finally {
-            c.close();
-        }
-
-        view.findViewById(R.id.all_message_count).setVisibility(View.GONE);
-        TextView unreadCountView = (TextView) view.findViewById(R.id.new_message_count);
-        if (unreadMessageCount > 0) {
-            unreadCountView.setText(String.valueOf(unreadMessageCount));
-            unreadCountView.setVisibility(View.VISIBLE);
-        } else {
-            unreadCountView.setVisibility(View.GONE);
-        }
-
-        view.findViewById(R.id.folder_icon).setVisibility(View.GONE);
-        view.findViewById(R.id.folder_button).setVisibility(View.VISIBLE);
-        view.findViewById(R.id.folder_separator).setVisibility(View.VISIBLE);
-        if (accountId == mDefaultAccountId) {
-            view.findViewById(R.id.default_sender).setVisibility(View.VISIBLE);
-        } else {
-            view.findViewById(R.id.default_sender).setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return mInflater.inflate(R.layout.account_folder_list_item, parent, false);
-    }
-
-    /*
-     * The following series of overrides insert the "Accounts" separator
-     */
-
-    /**
-     * Prevents the separator view from recycling into the other views
-     */
-    @Override
-    public int getItemViewType(int position) {
-        if (position == mSeparatorPosition) {
-            return IGNORE_ITEM_VIEW_TYPE;
-        }
-        return super.getItemViewType(position);
-    }
-
-    /**
-     * Injects the separator view when required, and fudges the cursor for other views
-     */
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        // The base class's getView() checks for mDataValid at the beginning, but we don't have
-        // to do that, because if the cursor is invalid getCount() returns 0, in which case this
-        // method wouldn't get called.
-
-        // Handle the separator here - create & bind
-        if (position == mSeparatorPosition) {
-            TextView view;
-            view = (TextView) mInflater.inflate(R.layout.list_separator, parent, false);
-            view.setText(R.string.account_folder_list_separator_accounts);
-            return view;
-        }
-        return super.getView(getRealPosition(position), convertView, parent);
-    }
-
-    /**
-     * Forces navigation to skip over the separator
-     */
-    @Override
-    public boolean areAllItemsEnabled() {
-        return false;
-    }
-
-    /**
-     * Forces navigation to skip over the separator
-     */
-    @Override
-    public boolean isEnabled(int position) {
-        if (position == mSeparatorPosition) {
-            return false;
-        } else if (isAccount(position)) {
-            Long id = ((MergeCursor)getItem(position)).getLong(Account.CONTENT_ID_COLUMN);
-            return !isOnDeletingAccountView(id);
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Adjusts list count to include separator
-     */
-    @Override
-    public int getCount() {
-        int count = super.getCount();
-        if (count > 0 && (mSeparatorPosition != ListView.INVALID_POSITION)) {
-            // Increment for separator, if we have anything to show.
-            count += 1;
-        }
-        return count;
-    }
-
-    /**
-     * Converts list position to cursor position
-     */
-    private int getRealPosition(int pos) {
-        if (mSeparatorPosition == ListView.INVALID_POSITION) {
-            // No separator, identity map
-            return pos;
-        } else if (pos <= mSeparatorPosition) {
-            // Before or at the separator, identity map
-            return pos;
-        } else {
-            // After the separator, remove 1 from the pos to get the real underlying pos
-            return pos - 1;
-        }
-    }
-
-    /**
-     * Returns the item using external position numbering (no separator)
-     */
-    @Override
-    public Object getItem(int pos) {
-        return super.getItem(getRealPosition(pos));
-    }
-
-    /**
-     * Returns the item id using external position numbering (no separator)
-     */
-    @Override
-    public long getItemId(int pos) {
-        return super.getItemId(getRealPosition(pos));
-    }
-}
-
diff --git a/src/com/android/email/activity/ActivityHelper.java b/src/com/android/email/activity/ActivityHelper.java
index bb6521798..175c87974 100644
--- a/src/com/android/email/activity/ActivityHelper.java
+++ b/src/com/android/email/activity/ActivityHelper.java
@@ -134,17 +134,4 @@ public final class ActivityHelper {
                     WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
         }
     }
-
-    public static void updateRefreshMenuIcon(MenuItem item, boolean show, boolean animate) {
-        if (show) {
-            item.setVisible(true);
-            if (animate) {
-                item.setActionView(R.layout.action_bar_indeterminate_progress);
-            } else {
-                item.setActionView(null);
-            }
-        } else {
-            item.setVisible(false);
-        }
-    }
 }
diff --git a/src/com/android/email/activity/EmailActivity.java b/src/com/android/email/activity/EmailActivity.java
index 0451d2f81..65644ea2e 100644
--- a/src/com/android/email/activity/EmailActivity.java
+++ b/src/com/android/email/activity/EmailActivity.java
@@ -20,7 +20,6 @@ import com.android.email.Controller;
 import com.android.email.ControllerResultUiThreadWrapper;
 import com.android.email.Email;
 import com.android.email.MessagingExceptionStrings;
-import com.android.email.NotificationController;
 import com.android.email.R;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.mail.MessagingException;
diff --git a/src/com/android/email/activity/MailboxList.java b/src/com/android/email/activity/MailboxList.java
deleted file mode 100644
index 829daf197..000000000
--- a/src/com/android/email/activity/MailboxList.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.email.Controller;
-import com.android.email.ControllerResultUiThreadWrapper;
-import com.android.email.Email;
-import com.android.email.MessagingExceptionStrings;
-import com.android.email.R;
-import com.android.email.RefreshManager;
-import com.android.email.activity.setup.AccountSettingsXL;
-import com.android.emailcommon.mail.MessagingException;
-import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.EmailContent.AccountColumns;
-import com.android.emailcommon.utility.Utility;
-
-import java.util.ArrayList;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.view.animation.AnimationUtils;
-import android.widget.TextView;
-
-// TODO: This has a lot in common with MessageList --should we merge them somehow?
-// But maybe we'll need to move to a single activity style anyway -- let's not worry about it too
-// much for now.  We might even completely ditch this activity and switch to a dialog.
-public class MailboxList extends Activity implements MailboxListFragment.Callback {
-
-    // Intent extras (internal to this activity)
-    private static final String EXTRA_ACCOUNT_ID = "com.android.email.activity._ACCOUNT_ID";
-
-    // UI support
-    private ActionBar mActionBar;
-    private TextView mErrorBanner;
-    private MailboxListFragment mListFragment;
-
-    private Controller.Result mControllerCallback;
-
-    // DB access
-    private long mAccountId;
-    private AsyncTask<Void, Void, String[]> mLoadAccountNameTask;
-
-    /**
-     * Open a specific account.
-     *
-     * @param context
-     * @param accountId the account to view
-     */
-    public static void actionHandleAccount(Context context, long accountId) {
-        Intent intent = new Intent(context, MailboxList.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.putExtra(EXTRA_ACCOUNT_ID, accountId);
-        context.startActivity(intent);
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        ActivityHelper.debugSetWindowFlags(this);
-
-        mAccountId = getIntent().getLongExtra(EXTRA_ACCOUNT_ID, -1);
-        if (mAccountId == -1) {
-            finish();
-            return;
-        }
-
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setContentView(R.layout.mailbox_list);
-
-        mControllerCallback = new ControllerResultUiThreadWrapper<ControllerResults>(
-                new Handler(), new ControllerResults());
-        mActionBar = getActionBar();
-        mErrorBanner = (TextView) findViewById(R.id.connection_error_text);
-        mListFragment = (MailboxListFragment) getFragmentManager()
-                .findFragmentById(R.id.mailbox_list_fragment);
-
-        mActionBar.setTitle(R.string.mailbox_list_title);
-        mListFragment.setCallback(this);
-        mListFragment.openMailboxes(mAccountId, -1);
-
-        // Halt the progress indicator (we'll display it later when needed)
-        setProgressBarIndeterminate(true);
-        setProgressBarIndeterminateVisibility(false);
-
-        // Go to the database for the account name
-        mLoadAccountNameTask = new AsyncTask<Void, Void, String[]>() {
-            @Override
-            protected String[] doInBackground(Void... params) {
-                String accountName = null;
-                Uri uri = ContentUris.withAppendedId(Account.CONTENT_URI, mAccountId);
-                Cursor c = MailboxList.this.getContentResolver().query(
-                        uri, new String[] { AccountColumns.DISPLAY_NAME }, null, null, null);
-                try {
-                    if (c.moveToFirst()) {
-                        accountName = c.getString(0);
-                    }
-                } finally {
-                    c.close();
-                }
-                return new String[] { accountName };
-            }
-
-            @Override
-            protected void onPostExecute(String[] result) {
-                if (result == null) {
-                    return;
-                }
-                final String accountName = (String) result[0];
-                // accountName is null if account name can't be retrieved or query exception
-                if (accountName == null) {
-                    // something is wrong with this account
-                    finish();
-                }
-                mActionBar.setTitle(R.string.mailbox_list_title);
-                mActionBar.setSubtitle(accountName);
-            }
-
-        }.execute();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        Controller.getInstance(getApplication()).removeResultCallback(mControllerCallback);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        Controller.getInstance(getApplication()).addResultCallback(mControllerCallback);
-
-        // Exit immediately if the accounts list has changed (e.g. externally deleted)
-        if (Email.getNotifyUiAccountsChanged()) {
-            Welcome.actionStart(this);
-            finish();
-            return;
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        Utility.cancelTaskInterrupt(mLoadAccountNameTask);
-        mLoadAccountNameTask = null;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.mailbox_list_option, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                onAccounts();
-                return true;
-            case R.id.refresh:
-                onRefresh();
-                return true;
-            case R.id.compose:
-                onCompose();
-                return true;
-            case R.id.account_settings:
-                onEditAccount();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    /**
-     * Implements MailboxFragment.Callback
-     */
-    @Override
-    public void onMailboxSelected(long accountId, long mailboxId, boolean navigate,
-            boolean dragDrop) {
-        // TODO handle folder navigation on the phone. when will we actually show the messages?
-        onOpenMailbox(mailboxId);
-    }
-
-    /**
-     * Implements MailboxFragment.Callback
-     */
-    @Override
-    public void onAccountSelected(long accountId) {
-        // Only used on the Combined view, which isn't used on the phone UI.
-    }
-
-    /**
-     * Implements MailboxFragment.Callback
-     */
-    @Override
-    public void onCurrentMailboxUpdated(long mailboxId, String mailboxName, int unreadCount) {
-    }
-
-    /**
-     * Refresh the mailbox list
-     */
-    private void onRefresh() {
-        Controller controller = Controller.getInstance(getApplication());
-        showProgressIcon(true);
-        RefreshManager.getInstance(this).refreshMailboxList(mAccountId);
-    }
-
-    private void onAccounts() {
-        AccountFolderList.actionShowAccounts(this);
-        finish();
-    }
-
-    private void onEditAccount() {
-        AccountSettingsXL.actionSettings(this, mAccountId);
-    }
-
-    private void onOpenMailbox(long mailboxId) {
-        MessageList.actionHandleMailbox(this, mailboxId);
-    }
-
-    private void onCompose() {
-        MessageCompose.actionCompose(this, mAccountId);
-    }
-
-    private void showProgressIcon(boolean show) {
-        setProgressBarIndeterminateVisibility(show);
-    }
-
-    private void showErrorBanner(String message) {
-        boolean isVisible = mErrorBanner.getVisibility() == View.VISIBLE;
-        if (message != null) {
-            mErrorBanner.setText(message);
-            if (!isVisible) {
-                mErrorBanner.setVisibility(View.VISIBLE);
-                mErrorBanner.startAnimation(
-                        AnimationUtils.loadAnimation(
-                                MailboxList.this, R.anim.header_appear));
-            }
-        } else {
-            if (isVisible) {
-                mErrorBanner.setVisibility(View.GONE);
-                mErrorBanner.startAnimation(
-                        AnimationUtils.loadAnimation(
-                                MailboxList.this, R.anim.header_disappear));
-            }
-        }
-    }
-
-    /**
-     * Controller results listener.  We wrap it with {@link ControllerResultUiThreadWrapper},
-     * so all methods are called on the UI thread.
-     */
-    private class ControllerResults extends Controller.Result {
-
-        @Override
-        public void updateMailboxListCallback(MessagingException result, long accountKey,
-                int progress) {
-            if (accountKey == mAccountId) {
-                updateBanner(result, progress);
-                updateProgress(result, progress);
-            }
-        }
-
-        @Override
-        public void updateMailboxCallback(MessagingException result, long accountKey,
-                long mailboxKey, int progress, int numNewMessages, ArrayList<Long> addedMessages) {
-            if (accountKey == mAccountId) {
-                updateBanner(result, progress);
-                updateProgress(result, progress);
-            }
-        }
-
-        @Override
-        public void sendMailCallback(MessagingException result, long accountId, long messageId,
-                int progress) {
-            if (accountId == mAccountId) {
-                updateBanner(result, progress);
-                updateProgress(result, progress);
-            }
-        }
-
-        private void updateProgress(MessagingException result, int progress) {
-            showProgressIcon(result == null && progress < 100);
-        }
-
-        /**
-         * Show or hide the connection error banner, and convert the various MessagingException
-         * variants into localizable text.  There is hysteresis in the show/hide logic:  Once shown,
-         * the banner will remain visible until some progress is made on the connection.  The
-         * goal is to keep it from flickering during retries in a bad connection state.
-         *
-         * @param result
-         * @param progress
-         */
-        private void updateBanner(MessagingException result, int progress) {
-            if (result != null) {
-                showErrorBanner(
-                        MessagingExceptionStrings.getErrorString(MailboxList.this, result));
-            } else if (progress > 0) {
-                showErrorBanner(null);
-            }
-        }
-    }
-}
diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
deleted file mode 100644
index de5d3ede3..000000000
--- a/src/com/android/email/activity/MessageList.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.email.Email;
-import com.android.email.R;
-import com.android.email.RefreshManager;
-import com.android.email.activity.setup.AccountSecurity;
-import com.android.email.activity.setup.AccountSettingsXL;
-import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.EmailContent.Mailbox;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.animation.AnimationUtils;
-import android.widget.TextView;
-
-import java.util.Set;
-
-public class MessageList extends Activity implements MessageListFragment.Callback {
-    // Intent extras (internal to this activity)
-    private static final String EXTRA_ACCOUNT_ID = "com.android.email.activity._ACCOUNT_ID";
-    private static final String EXTRA_MAILBOX_TYPE = "com.android.email.activity.MAILBOX_TYPE";
-    private static final String EXTRA_MAILBOX_ID = "com.android.email.activity.MAILBOX_ID";
-
-    private static final int REQUEST_SECURITY = 0;
-
-    // UI support
-    private MessageListFragment mListFragment;
-    private TextView mErrorBanner;
-
-    private RefreshManager mRefreshManager;
-    private final RefreshListener mRefreshListener = new RefreshListener();
-
-    private MailboxFinder mMailboxFinder;
-    private final MailboxFinderCallback mMailboxFinderCallback = new MailboxFinderCallback();
-
-    /* package */ MessageListFragment getListFragmentForTest() {
-        return mListFragment;
-    }
-
-    /**
-     * Open a specific mailbox.
-     *
-     * TODO This should just shortcut to a more generic version that can accept a list of
-     * accounts/mailboxes (e.g. merged inboxes).
-     *
-     * @param context
-     * @param mailboxType mailbox key
-     */
-    public static void actionHandleMailbox(Context context, long mailboxType) {
-        context.startActivity(createIntent(context, -1, mailboxType, -1));
-    }
-
-    /**
-     * Open a specific mailbox by account & type
-     *
-     * @param context The caller's context (for generating an intent)
-     * @param accountId The account to open
-     * @param mailboxType the type of mailbox to open (e.g. @see EmailContent.Mailbox.TYPE_INBOX)
-     */
-    public static void actionHandleAccount(Context context, long accountId, int mailboxType) {
-        context.startActivity(createIntent(context, accountId, -1, mailboxType));
-    }
-
-    /**
-     * Return an intent to open a specific mailbox by account & type.
-     *
-     * @param context The caller's context (for generating an intent)
-     * @param accountId The account to open, or -1
-     * @param mailboxId the ID of the mailbox to open, or -1
-     * @param mailboxType the type of mailbox to open (e.g. @see Mailbox.TYPE_INBOX) or -1
-     */
-    public static Intent createIntent(Context context, long accountId, long mailboxId,
-            int mailboxType) {
-        Intent intent = new Intent(context, MessageList.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        if (accountId != -1) intent.putExtra(EXTRA_ACCOUNT_ID, accountId);
-        if (mailboxId != -1) intent.putExtra(EXTRA_MAILBOX_ID, mailboxId);
-        if (mailboxType != -1) intent.putExtra(EXTRA_MAILBOX_TYPE, mailboxType);
-        return intent;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        ActivityHelper.debugSetWindowFlags(this);
-        setContentView(R.layout.message_list);
-
-        mRefreshManager = RefreshManager.getInstance(this);
-        mRefreshManager.registerListener(mRefreshListener);
-        mListFragment = (MessageListFragment) getFragmentManager()
-                .findFragmentById(R.id.message_list_fragment);
-        mErrorBanner = (TextView) findViewById(R.id.connection_error_text);
-
-        mListFragment.setCallback(this);
-
-        // Show the appropriate account/mailbox specified by an {@link Intent}.
-        selectAccountAndMailbox(getIntent());
-    }
-
-    /**
-     * Show the appropriate account/mailbox specified by an {@link Intent}.
-     */
-    private void selectAccountAndMailbox(Intent intent) {
-        long mailboxId = intent.getLongExtra(EXTRA_MAILBOX_ID, -1);
-        if (mailboxId != -1) {
-            mListFragment.openMailbox(mailboxId);
-        } else {
-            int mailboxType = intent.getIntExtra(EXTRA_MAILBOX_TYPE, Mailbox.TYPE_INBOX);
-            Uri uri = intent.getData();
-            // TODO Possible ANR.  getAccountIdFromShortcutSafeUri accesses DB.
-            long accountId = (uri == null) ? -1
-                    : Account.getAccountIdFromShortcutSafeUri(this, uri);
-            if (accountId == -1) {
-                accountId = intent.getLongExtra(EXTRA_ACCOUNT_ID, -1);
-            }
-            if (accountId == -1) {
-                launchWelcomeAndFinish();
-                return;
-            }
-            mMailboxFinder = new MailboxFinder(this, accountId, mailboxType,
-                    mMailboxFinderCallback);
-            mMailboxFinder.startLookup();
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        // Exit immediately if the accounts list has changed (e.g. externally deleted)
-        if (Email.getNotifyUiAccountsChanged()) {
-            Welcome.actionStart(this);
-            finish();
-            return;
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (mMailboxFinder != null) {
-            mMailboxFinder.cancel();
-            mMailboxFinder = null;
-        }
-        mRefreshManager.unregisterListener(mRefreshListener);
-        super.onDestroy();
-    }
-
-
-    private void launchWelcomeAndFinish() {
-        Welcome.actionStart(this);
-        finish();
-    }
-
-    @Override
-    public void onListLoaded() {
-        // Now we know if the mailbox is refreshable
-        updateProgressIcon();
-    }
-
-    /**
-     * Called when the list fragment can't find mailbox/account.
-     */
-    @Override
-    public void onMailboxNotFound() {
-        finish();
-    }
-
-    @Override
-    public void onMessageOpen(long messageId, long messageMailboxId, long listMailboxId, int type) {
-        if (type == MessageListFragment.Callback.TYPE_DRAFT) {
-            MessageCompose.actionEditDraft(this, messageId);
-        } else {
-            // WARNING: here we pass "listMailboxId", which can be the negative id of
-            // a combined mailbox, instead of the mailboxId of the particular message that
-            // is opened.  This is to support the next/prev buttons on the message view
-            // properly even for combined mailboxes.
-            MessageView.actionView(this, messageId, listMailboxId);
-        }
-    }
-
-    @Override
-    public void onEnterSelectionMode(boolean enter) {
-    }
-
-
-    @Override
-    public void onAdvancingOpAccepted(Set<Long> affectedMessages) {
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.message_list_option, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // this method can be called in the very early stage of the activity lifecycle, where
-        // mListFragment isn't ready yet.
-        boolean show = (mListFragment != null) && mListFragment.isRefreshable();
-        boolean animate = (mListFragment != null) && mRefreshManager.isMessageListRefreshing(
-                mListFragment.getMailboxId());
-        ActivityHelper.updateRefreshMenuIcon(menu.findItem(R.id.refresh), show, animate);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.refresh:
-                mListFragment.onRefresh(true);
-                return true;
-            case R.id.folders:
-                onFolders();
-                return true;
-            case R.id.accounts:
-                onAccounts();
-                return true;
-            case R.id.compose:
-                onCompose();
-                return true;
-            case R.id.account_settings:
-                onEditAccount();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    private void onFolders() {
-        long accountId = mListFragment.getAccountId();
-        // accountId will be -1 when a) mailbox is still loading, or for magic mailboxes.
-        if (accountId != -1) {
-            MailboxList.actionHandleAccount(this, accountId);
-            finish();
-        }
-    }
-
-    private void onAccounts() {
-        AccountFolderList.actionShowAccounts(this);
-        finish();
-    }
-
-    private void onCompose() {
-        // Passing account = -1 is okay -- the default account will be used.
-        MessageCompose.actionCompose(this, mListFragment.getAccountId());
-    }
-
-    private void onEditAccount() {
-        // Passing account = -1 is okay
-        AccountSettingsXL.actionSettings(this, mListFragment.getAccountId());
-    }
-
-    /**
-     * Handle the eventual result from the security update activity
-     *
-     * Note, this is extremely coarse, and it simply returns the user to the Accounts list.
-     * Anything more requires refactoring of this Activity.
-     */
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case REQUEST_SECURITY:
-                onAccounts();
-        }
-    }
-
-    private void updateProgressIcon() {
-        invalidateOptionsMenu(); // animate/stop refreshing icon
-    }
-
-    private void showErrorBanner(String message) {
-        boolean isVisible = mErrorBanner.getVisibility() == View.VISIBLE;
-        if (!TextUtils.isEmpty(message)) {
-            mErrorBanner.setText(message);
-            if (!isVisible) {
-                mErrorBanner.setVisibility(View.VISIBLE);
-                mErrorBanner.startAnimation(
-                        AnimationUtils.loadAnimation(
-                                MessageList.this, R.anim.header_appear));
-            }
-        } else {
-            if (isVisible) {
-                mErrorBanner.setVisibility(View.GONE);
-                mErrorBanner.startAnimation(
-                        AnimationUtils.loadAnimation(
-                                MessageList.this, R.anim.header_disappear));
-            }
-        }
-    }
-
-    private class RefreshListener implements RefreshManager.Listener {
-        @Override
-        public void onMessagingError(long accountId, long mailboxId, String message) {
-            updateProgressIcon();
-            showErrorBanner(message);
-        }
-
-        @Override
-        public void onRefreshStatusChanged(long accountId, long mailboxId) {
-            updateProgressIcon();
-            showErrorBanner(null);
-        }
-    }
-
-    private class MailboxFinderCallback implements MailboxFinder.Callback {
-        @Override
-        public void onMailboxFound(long accountId, long mailboxId) {
-            mListFragment.openMailbox(mailboxId);
-        }
-
-        @Override
-        public void onAccountNotFound() {
-            // Let the Welcome activity show the default screen.
-            launchWelcomeAndFinish();
-        }
-
-        @Override
-        public void onMailboxNotFound(long accountId) {
-            // Let the Welcome activity show the default screen.
-            launchWelcomeAndFinish();
-        }
-
-        @Override
-        public void onAccountSecurityHold(long accountId) {
-            // launch the security setup activity
-            Intent i = AccountSecurity.actionUpdateSecurityIntent(
-                    MessageList.this, accountId, true);
-            startActivityForResult(i, REQUEST_SECURITY);
-        }
-    }
-}
diff --git a/src/com/android/email/activity/MessageListFragment.java b/src/com/android/email/activity/MessageListFragment.java
index 1afaa8c2f..9fe6bbede 100644
--- a/src/com/android/email/activity/MessageListFragment.java
+++ b/src/com/android/email/activity/MessageListFragment.java
@@ -1263,7 +1263,7 @@ public class MessageListFragment extends ListFragment
             mSelectionMode = mode;
 
             MenuInflater inflater = getActivity().getMenuInflater();
-            inflater.inflate(R.menu.message_list_selection_mode, menu);
+            inflater.inflate(R.menu.message_list_fragment_cab_options, menu);
             mMarkRead = menu.findItem(R.id.mark_read);
             mMarkUnread = menu.findItem(R.id.mark_unread);
             mAddStar = menu.findItem(R.id.add_star);
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
deleted file mode 100644
index 8f3ba8ca1..000000000
--- a/src/com/android/email/activity/MessageView.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.email.Email;
-import com.android.email.Preferences;
-import com.android.email.R;
-import com.android.emailcommon.Logging;
-import com.android.emailcommon.provider.EmailContent.Mailbox;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-/**
- * Activity to show (non-EML) email messages.
- *
- * This activity shows regular email messages, which are not file-based.  (i.e. not *.eml or *.msg)
- *
- * See {@link MessageViewBase} for the class relation diagram.
- */
-public class MessageView extends MessageViewBase implements View.OnClickListener,
-        MessageOrderManager.Callback, MessageViewFragment.Callback {
-    private static final String EXTRA_MESSAGE_ID = "com.android.email.MessageView_message_id";
-    private static final String EXTRA_MAILBOX_ID = "com.android.email.MessageView_mailbox_id";
-
-    // for saveInstanceState()
-    private static final String STATE_MESSAGE_ID = "messageId";
-
-    private long mMessageId;
-    private long mMailboxId;
-
-    private MessageOrderManager mOrderManager;
-
-    private MessageViewFragment mFragment;
-
-    private View mMoveToNewer;
-    private View mMoveToOlder;
-    private View mReplyButton;
-    private View mReplyAllButton;
-
-    // False when a message can't be forwarded/replied, such as trashed messages
-    private boolean mReplyAndForwardEnabled;
-
-    /**
-     * View a specific message found in the Email provider.
-     * @param messageId the message to view.
-     * @param mailboxId identifies the sequence of messages used for newer/older navigation.
-     */
-    public static void actionView(Context context, long messageId, long mailboxId) {
-        context.startActivity(getActionViewIntent(context, messageId, mailboxId));
-    }
-
-    public static Intent getActionViewIntent(Context context, long messageId, long mailboxId) {
-        if (messageId < 0) {
-            throw new IllegalArgumentException("MessageView invalid messageId " + messageId);
-        }
-        Intent i = new Intent(context, MessageView.class);
-        i.putExtra(EXTRA_MESSAGE_ID, messageId);
-        i.putExtra(EXTRA_MAILBOX_ID, mailboxId);
-        return i;
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.message_view;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mFragment = (MessageViewFragment) getFragmentManager()
-                .findFragmentById(R.id.message_view_fragment);
-        mFragment.setCallback(this);
-
-        mMoveToNewer = UiUtilities.getView(this, R.id.moveToNewer);
-        mMoveToOlder = UiUtilities.getView(this, R.id.moveToOlder);
-        mMoveToNewer.setOnClickListener(this);
-        mMoveToOlder.setOnClickListener(this);
-        mReplyButton = UiUtilities.getView(this, R.id.reply);
-        mReplyAllButton = UiUtilities.getView(this, R.id.reply_all);
-
-        initFromIntent();
-        if (icicle != null) {
-            mMessageId = icicle.getLong(STATE_MESSAGE_ID, mMessageId);
-        }
-    }
-
-    private void initFromIntent() {
-        Intent intent = getIntent();
-        mMessageId = intent.getLongExtra(EXTRA_MESSAGE_ID, -1);
-        mMailboxId = intent.getLongExtra(EXTRA_MAILBOX_ID, -1);
-        if (mMessageId == -1 || mMailboxId == -1) {
-            Log.w(Logging.LOG_TAG, "Insufficient intent parameter.  Closing...");
-            finish();
-            return;
-        }
-
-        enableForwardReply(false);
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle state) {
-        super.onSaveInstanceState(state);
-        if (mMessageId != -1) {
-            state.putLong(STATE_MESSAGE_ID, mMessageId);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        // Exit immediately if the accounts list has changed (e.g. externally deleted)
-        if (Email.getNotifyUiAccountsChanged()) {
-            Welcome.actionStart(this);
-            finish();
-            return;
-        }
-        mOrderManager = new MessageOrderManager(this, mMailboxId, this);
-        messageChanged();
-    }
-
-    @Override
-    public void onPause() {
-        if (mOrderManager != null) {
-            mOrderManager.close();
-            mOrderManager = null;
-        }
-        super.onPause();
-    }
-
-    // Note the return type is a subclass of that of the super class method.
-    @Override
-    protected MessageViewFragment getFragment() {
-        return mFragment;
-    }
-
-    @Override
-    protected long getAccountId() {
-        return getFragment().getAccountId();
-    }
-
-    @Override
-    public void onMessageViewShown(int mailboxType) {
-        super.onMessageViewShown(mailboxType);
-        enableForwardReply(mailboxType != Mailbox.TYPE_TRASH);
-    }
-
-    private void onDeleteMessage() {
-        // the delete triggers mCursorObserver in MessageOrderManager.
-        // first move to older/newer before the actual delete
-        long messageIdToDelete = mMessageId;
-
-        boolean moved = autoAdvance();
-        ActivityHelper.deleteMessage(this, messageIdToDelete);
-        if (!moved) {
-            // this generates a benign warning "Duplicate finish request" because
-            // MessageOrderManager detects that the current message is gone, and we finish() it
-            // in the onMessageNotFound() callback.
-            finish();
-        }
-    }
-
-    /**
-     * Auto-advances the message being shown according to the auto-advance policy set in preferences
-     * @return Whether or not a new message was selected. This will return false either if there are
-     *     no appropriate messages to advance to, or if the preferences indicate we should not
-     *     auto-advance
-     */
-    private boolean autoAdvance() {
-        switch (Preferences.getPreferences(this).getAutoAdvanceDirection()) {
-            case Preferences.AUTO_ADVANCE_NEWER:
-                return moveToNewer();
-            case Preferences.AUTO_ADVANCE_OLDER:
-                return moveToOlder();
-        }
-        return false;
-    }
-
-    private boolean moveToOlder() {
-        if (mOrderManager != null && mOrderManager.moveToOlder()) {
-            mMessageId = mOrderManager.getCurrentMessageId();
-            messageChanged();
-            return true;
-        }
-        return false;
-    }
-
-    private boolean moveToNewer() {
-        if (mOrderManager != null && mOrderManager.moveToNewer()) {
-            mMessageId = mOrderManager.getCurrentMessageId();
-            messageChanged();
-            return true;
-        }
-        return false;
-    }
-
-    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:
-                onDeleteMessage();
-                break;
-            case R.id.moveToOlder:
-                moveToOlder();
-                break;
-            case R.id.moveToNewer:
-                moveToNewer();
-                break;
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        boolean handled = handleMenuItem(item.getItemId());
-        if (!handled) {
-            handled = super.onOptionsItemSelected(item);
-        }
-        return handled;
-    }
-
-    /**
-     * This is the core functionality of onOptionsItemSelected() but broken out and exposed
-     * for testing purposes (because it's annoying to mock a MenuItem).
-     *
-     * @param menuItemId id that was clicked
-     * @return true if handled here
-     */
-    /* package */ boolean handleMenuItem(int menuItemId) {
-        switch (menuItemId) {
-            case R.id.delete:
-                onDeleteMessage();
-                break;
-            case R.id.reply:
-                onReply();
-                break;
-            case R.id.reply_all:
-                onReplyAll();
-                break;
-            case R.id.forward:
-                onForward();
-                break;
-            case R.id.mark_as_unread:
-                getFragment().onMarkMessageAsRead(false);
-                break;
-            default:
-                return false;
-        }
-        return true;
-    }
-
-    @Override
-    public void onMessageSetUnread() {
-        if (!autoAdvance()) {
-            finish();
-        }
-    }
-
-    private void enableForwardReply(boolean enabled) {
-        mReplyAndForwardEnabled = enabled;
-        mReplyButton.setEnabled(enabled);
-        mReplyAllButton.setEnabled(enabled);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.message_view_option, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        menu.findItem(R.id.forward).setEnabled(mReplyAndForwardEnabled);
-        menu.findItem(R.id.reply).setEnabled(mReplyAndForwardEnabled);
-        menu.findItem(R.id.reply_all).setEnabled(mReplyAndForwardEnabled);
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    /**
-     * Sync the current message.
-     * - Set message id to the fragment and the message order manager.
-     * - Update the navigation arrows.
-     */
-    private void messageChanged() {
-        getFragment().openMessage(mMessageId);
-        if (mOrderManager != null) {
-            mOrderManager.moveTo(mMessageId);
-        }
-        updateNavigationArrows();
-    }
-
-    /**
-     * Update the arrows based on the current position of the older/newer cursor.
-     */
-    private void updateNavigationArrows() {
-        mMoveToNewer.setEnabled((mOrderManager != null) && mOrderManager.canMoveToNewer());
-        mMoveToOlder.setEnabled((mOrderManager != null) && mOrderManager.canMoveToOlder());
-    }
-
-    /** Implements {@link MessageOrderManager.Callback#onMessageNotFound()}. */
-    // TODO Name too generic.  Rename this.
-    @Override
-    public void onMessageNotFound() {
-        finish();
-    }
-
-    /** Implements {@link MessageOrderManager.Callback#onMessagesChanged()}. */
-    // TODO Name too generic.  Rename this.
-    @Override
-    public void onMessagesChanged() {
-        updateNavigationArrows();
-    }
-
-    @Override
-    public void onRespondedToInvite(int response) {
-        if (!autoAdvance()) {
-            finish();
-        }
-    }
-
-    @Override
-    public void onCalendarLinkClicked(long epochEventStartTime) {
-        ActivityHelper.openCalendar(this, epochEventStartTime);
-    }
-
-    @Override
-    public void onReply() {
-        MessageCompose.actionReply(this, mMessageId, false);
-        finish();
-    }
-
-    @Override
-    public void onReplyAll() {
-        MessageCompose.actionReply(this, mMessageId, true);
-        finish();
-    }
-
-    @Override
-    public void onForward() {
-        MessageCompose.actionForward(this, mMessageId);
-        finish();
-    }
-
-    @Override
-    public void onBeforeMessageGone() {
-        // TODO Implement this
-    }
-}
diff --git a/src/com/android/email/activity/MessageViewBase.java b/src/com/android/email/activity/MessageViewBase.java
index b05b4d781..b3035438d 100644
--- a/src/com/android/email/activity/MessageViewBase.java
+++ b/src/com/android/email/activity/MessageViewBase.java
@@ -17,37 +17,14 @@
 package com.android.email.activity;
 
 import com.android.email.Controller;
-import com.android.email.R;
 
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.os.Bundle;
 
 /**
- * Base class for {@link MessageView} and {@link MessageFileView}.
- *
- * Class relation diagram:
- * <pre>
- * (activities)                       (fragments)
- * MessageViewBase                    MessageViewFragmentBase
- *   |                                  |     (with nested interface Callback)
- *   |                                  |
- *   |-- MessageFileView  -- owns -->   |-- MessageFileViewFragment : For EML files.
- *   |                                  |     (with nested interface Callback, which implements
- *   |                                  |      MessageViewFragmentBase.Callback)
- *   |                                  |
- *   |-- MessageView      -- owns -->   |-- MessageViewFragment     : For regular messages
- *
- * MessageView is basically same as MessageFileView, but has more operations, such as "delete",
- * "forward", "reply", etc.
- *
- * Similarly, MessageViewFragment has more operations than MessageFileViewFragment does, such as
- * "mark unread", "respond to invite", etc.  Also its Callback interface has more method than
- * MessageViewFragmentBase.Callback does, for the extra operations.
- * </pre>
+ * TODO Now that MessageView is gone, we can merge it with {@link MessageFileView}.
  */
 public abstract class MessageViewBase extends Activity implements MessageViewFragmentBase.Callback {
-    private ProgressDialog mFetchAttachmentProgressDialog;
     private Controller mController;
 
     protected abstract int getLayoutId();
@@ -58,12 +35,6 @@ public abstract class MessageViewBase extends Activity implements MessageViewFra
         ActivityHelper.debugSetWindowFlags(this);
         setContentView(getLayoutId());
 
-        // TODO Turn it into a "managed" dialog?
-        // Managed dialogs survive activity re-creation.  (e.g. orientation change)
-        mFetchAttachmentProgressDialog = new ProgressDialog(this);
-        mFetchAttachmentProgressDialog.setIndeterminate(true);
-        mFetchAttachmentProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-
         mController = Controller.getInstance(getApplication());
     }
 
diff --git a/src/com/android/email/activity/UIControllerBase.java b/src/com/android/email/activity/UIControllerBase.java
index 8895276ef..2c24828d9 100644
--- a/src/com/android/email/activity/UIControllerBase.java
+++ b/src/com/android/email/activity/UIControllerBase.java
@@ -17,12 +17,15 @@
 package com.android.email.activity;
 
 import com.android.email.Email;
+import com.android.email.R;
 import com.android.email.RefreshManager;
+import com.android.email.activity.setup.AccountSettingsXL;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.provider.EmailContent.Account;
 import com.android.emailcommon.utility.EmailAsyncTask;
 
 import android.app.Fragment;
+import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.os.Bundle;
 import android.util.Log;
@@ -35,11 +38,16 @@ import java.util.ArrayList;
 /**
  * Base class for the UI controller.
  *
- * Note: Always use {@link #commitFragmentTransaction} to commit fragment transactions.
+ * Note: Always use {@link #commitFragmentTransaction} and {@link #popBackStack} to operate fragment
+ * transactions.
  * (Currently we use synchronous transactions only, but we may want to switch back to asynchronous
  * later.)
  */
 abstract class UIControllerBase {
+    protected static final String BUNDLE_KEY_ACCOUNT_ID = "UIController.state.account_id";
+    protected static final String BUNDLE_KEY_MAILBOX_ID = "UIController.state.mailbox_id";
+    protected static final String BUNDLE_KEY_MESSAGE_ID = "UIController.state.message_id";
+
     /** No account selected */
     static final long NO_ACCOUNT = -1;
     /** No mailbox selected */
@@ -50,10 +58,10 @@ abstract class UIControllerBase {
     /** The owner activity */
     final EmailActivity mActivity;
 
-    final RefreshManager mRefreshManager;
-
     final EmailAsyncTask.Tracker mTaskTracker = new EmailAsyncTask.Tracker();
 
+    final RefreshManager mRefreshManager;
+
     /**
      * List of fragments that are restored by the framework while the activity is being re-created
      * for configuration changes (e.g. screen rotation).  We'll install them later when the activity
@@ -67,6 +75,19 @@ abstract class UIControllerBase {
      */
     private boolean mHoldFragmentInstallation = true;
 
+    private final RefreshManager.Listener mRefreshListener
+            = new RefreshManager.Listener() {
+        @Override
+        public void onMessagingError(final long accountId, long mailboxId, final String message) {
+            updateRefreshProgress();
+        }
+
+        @Override
+        public void onRefreshStatusChanged(long accountId, long mailboxId) {
+            updateRefreshProgress();
+        }
+    };
+
     public UIControllerBase(EmailActivity activity) {
         mActivity = activity;
         mRefreshManager = RefreshManager.getInstance(mActivity);
@@ -101,6 +122,7 @@ abstract class UIControllerBase {
         if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
             Log.d(Logging.LOG_TAG, this + " onActivityCreated");
         }
+        mRefreshManager.registerListener(mRefreshListener);
     }
 
     /**
@@ -147,6 +169,7 @@ abstract class UIControllerBase {
             Log.d(Logging.LOG_TAG, this + " onActivityDestroy");
         }
         mHoldFragmentInstallation = true; // No more fragment installation.
+        mRefreshManager.unregisterListener(mRefreshListener);
         mTaskTracker.cancellAllInterrupt();
     }
 
@@ -209,6 +232,11 @@ abstract class UIControllerBase {
         }
     }
 
+    // not used
+    void popBackStack(FragmentManager fm, String name, int flags) {
+        fm.popBackStackImmediate(name, flags);
+    }
+
     void commitFragmentTransaction(FragmentTransaction ft) {
         ft.commit();
         mActivity.getFragmentManager().executePendingTransactions();
@@ -222,15 +250,29 @@ abstract class UIControllerBase {
      */
     public abstract long getUIAccountId();
 
+    /**
+     * @return true if an account is selected, or the current view is the combined view.
+     */
+    public final boolean isAccountSelected() {
+        return getUIAccountId() != NO_ACCOUNT;
+    }
+
+    /**
+     * @return if an actual account is selected.  (i.e. {@link Account#ACCOUNT_ID_COMBINED_VIEW}
+     * is not considered "actual".s)
+     */
+    public final boolean isActualAccountSelected() {
+        return isAccountSelected() && (getUIAccountId() != Account.ACCOUNT_ID_COMBINED_VIEW);
+    }
+
     /**
      * @return the currently selected account ID.  If the current view is the combined view,
      * it'll return {@link #NO_ACCOUNT}.
      *
      * @see #getUIAccountId()
      */
-    public long getActualAccountId() {
-        final long uiAccountId = getUIAccountId();
-        return uiAccountId == Account.ACCOUNT_ID_COMBINED_VIEW ? NO_ACCOUNT : uiAccountId;
+    public final long getActualAccountId() {
+        return isActualAccountSelected() ? getUIAccountId() : NO_ACCOUNT;
     }
 
     /**
@@ -263,19 +305,71 @@ abstract class UIControllerBase {
     /**
      * Handles the {@link android.app.Activity#onCreateOptionsMenu} callback.
      */
-    public abstract boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu);
+    public boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu) {
+        inflater.inflate(R.menu.email_activity_options, menu);
+        return true;
+    }
 
     /**
      * Handles the {@link android.app.Activity#onPrepareOptionsMenu} callback.
      */
-    public abstract boolean onPrepareOptionsMenu(MenuInflater inflater, Menu menu);
+    public boolean onPrepareOptionsMenu(MenuInflater inflater, Menu menu) {
+
+        // Update the refresh button.
+        MenuItem item = menu.findItem(R.id.refresh);
+        if (isRefreshEnabled()) {
+            item.setVisible(true);
+            if (isRefreshInProgress()) {
+                item.setActionView(R.layout.action_bar_indeterminate_progress);
+            } else {
+                item.setActionView(null);
+            }
+        } else {
+            item.setVisible(false);
+        }
+        return true;
+    }
 
     /**
      * Handles the {@link android.app.Activity#onOptionsItemSelected} callback.
      *
      * @return true if the option item is handled.
      */
-    public abstract boolean onOptionsItemSelected(MenuItem item);
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // Comes from the action bar when the app icon on the left is pressed.
+                // It works like a back press, but it won't close the activity.
+                return onBackPressed(false);
+            case R.id.compose:
+                return onCompose();
+            case R.id.refresh:
+                onRefresh();
+                return true;
+            case R.id.account_settings:
+                return onAccountSettings();
+        }
+        return false;
+    }
+
+    /**
+     * Opens the message compose activity.
+     */
+    private boolean onCompose() {
+        if (!isAccountSelected()) {
+            return false; // this shouldn't really happen
+        }
+        MessageCompose.actionCompose(mActivity, getActualAccountId());
+        return true;
+    }
+
+    /**
+     * Handles the "Settings" option item.  Opens the settings activity.
+     */
+    private boolean onAccountSettings() {
+        AccountSettingsXL.actionSettings(mActivity, getActualAccountId());
+        return true;
+    }
 
     /**
      * STOPSHIP For experimental UI.  Remove this.
@@ -292,10 +386,30 @@ abstract class UIControllerBase {
     public abstract long getMailboxSettingsMailboxId();
 
     /**
-     * STOPSHIP For experimental UI.  Remove this.
+     * STOPSHIP For experimental UI.  Make it abstract protected.
      *
      * Performs "refesh".
      */
-    public void onRefresh() {
+    public abstract void onRefresh();
+
+    /**
+     * @return true if refresh is in progress for the current mailbox.
+     */
+    protected abstract boolean isRefreshInProgress();
+
+    /**
+     * @return true if the UI should enable the "refresh" command.
+     */
+    protected abstract boolean isRefreshEnabled();
+
+
+    /**
+     * Start/stop the "refresh" animation on the action bar according to the current refresh state.
+     *
+     * (We start the animation if {@link #isRefreshInProgress} returns true,
+     * and stop otherwise.)
+     */
+    protected void updateRefreshProgress() {
+        mActivity.invalidateOptionsMenu();
     }
 }
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index 707e49d1b..f1cf6c3e0 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -16,57 +16,391 @@
 
 package com.android.email.activity;
 
+import com.android.email.Email;
 import com.android.email.R;
+import com.android.emailcommon.Logging;
+import com.android.emailcommon.provider.EmailContent.Mailbox;
+import com.android.emailcommon.utility.Utility;
 
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.util.Set;
 
 
 /**
  * UI Controller for non x-large devices.  Supports a single-pane layout.
+ *
+ * STOPSHIP Everything in this class is 100% temporary at this point
+ * - Navigation model is different from what it should be (whatever it'll be).
+ *   e.g. when the app is launched, we should show Inbox, not mailbox list.
+ *
+ * - It uses the two-pane action bar only so that we can change accounts
+ *
+ * Major TODOs
+ * - TODO Proper Navigation model, including retaining fragments to keep state such as the scroll
+ *        position and batch selection.
+ * - TODO Nested folders
+ * - TODO Newer/Older for message view
+ * - TODO Implement callbacks
  */
 class UIControllerOnePane extends UIControllerBase {
+    private ActionBarController mActionBarController;
+
+    /**
+     * Current account/mailbox/message IDs.
+     * Don't use them directly; use the accessors instead, as we might want to get them from the
+     * topmost fragment in the future.
+     */
+    private long mCurrentAccountId = NO_ACCOUNT;
+    private long mCurrentMailboxId = NO_MAILBOX;
+    private long mCurrentMessageId = NO_MESSAGE;
+
+    private MessageCommandButtonView mMessageCommandButtons;
+
+    private final MailboxListFragment.Callback mMailboxListFragmentCallback =
+            new MailboxListFragment.Callback() {
+        @Override
+        public void onAccountSelected(long accountId) {
+            openAccount(accountId);
+        }
+
+        @Override
+        public void onCurrentMailboxUpdated(long mailboxId, String mailboxName, int unreadCount) {
+        }
+
+        @Override
+        public void onMailboxSelected(
+                long accountId, long mailboxId, boolean navigate, boolean dragDrop) {
+            open(accountId, mailboxId, NO_MESSAGE);
+        }
+    };
+
+    private final MessageListFragment.Callback mMessageListFragmentCallback =
+            new MessageListFragment.Callback() {
+        @Override
+        public void onAdvancingOpAccepted(Set<Long> affectedMessages) {
+            // Nothing to do on 1 pane.
+        }
+
+        @Override
+        public void onEnterSelectionMode(boolean enter) {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onListLoaded() {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onMailboxNotFound() {
+            open(getUIAccountId(), NO_MAILBOX, NO_MESSAGE);
+        }
+
+        @Override
+        public void onMessageOpen(
+                long messageId, long messageMailboxId, long listMailboxId, int type) {
+            if (type == MessageListFragment.Callback.TYPE_DRAFT) {
+                MessageCompose.actionEditDraft(mActivity, messageId);
+            } else {
+                open(getUIAccountId(), getMailboxId(), messageId);
+            }
+        }
+    };
+
+    private final MessageViewFragment.Callback mMessageViewFragmentCallback =
+            new MessageViewFragment.Callback() {
+        @Override
+        public void onForward() {
+            MessageCompose.actionForward(mActivity, getMessageId());
+        }
+
+        @Override
+        public void onReply() {
+            MessageCompose.actionReply(mActivity, getMessageId(), false);
+        }
+
+        @Override
+        public void onReplyAll() {
+            MessageCompose.actionReply(mActivity, getMessageId(), true);
+        }
+
+        @Override
+        public void onCalendarLinkClicked(long epochEventStartTime) {
+            ActivityHelper.openCalendar(mActivity, epochEventStartTime);
+        }
+
+        @Override
+        public boolean onUrlInMessageClicked(String url) {
+            return ActivityHelper.openUrlInMessage(mActivity, url, getActualAccountId());
+        }
+
+        @Override
+        public void onBeforeMessageGone() {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onMessageSetUnread() {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onRespondedToInvite(int response) {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onLoadMessageError(String errorMessage) {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onLoadMessageFinished() {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onLoadMessageStarted() {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onMessageNotExists() {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onMessageViewGone() {
+            // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onMessageViewShown(int mailboxType) {
+            // TODO Auto-generated method stub
+
+        }
+    };
+
+
+    // This is all temporary as we'll have a different action bar controller for 1-pane.
+    private final ActionBarController.Callback mActionBarControllerCallback
+            = new ActionBarController.Callback() {
+        @Override
+        public boolean shouldShowMailboxName() {
+            return false; // no mailbox name/unread count.
+        }
+
+        @Override
+        public String getCurrentMailboxName() {
+            return null; // no mailbox name/unread count.
+        }
+
+        @Override
+        public int getCurrentMailboxUnreadCount() {
+            return 0; // no mailbox name/unread count.
+        }
+
+        @Override
+        public boolean shouldShowUp() {
+            // Always show the UP arrow.
+            return true;
+        }
+
+        @Override
+        public long getUIAccountId() {
+            return UIControllerOnePane.this.getUIAccountId();
+        }
+
+        @Override
+        public boolean isAccountSelected() {
+            return UIControllerOnePane.this.isAccountSelected();
+        }
+
+        @Override
+        public void onAccountSelected(long accountId) {
+            openAccount(accountId);
+        }
+
+        @Override
+        public void onNoAccountsFound() {
+            Welcome.actionStart(mActivity);
+            mActivity.finish();
+        }
+    };
+
     public UIControllerOnePane(EmailActivity activity) {
         super(activity);
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putLong(BUNDLE_KEY_ACCOUNT_ID, mCurrentAccountId);
+        outState.putLong(BUNDLE_KEY_MAILBOX_ID, mCurrentMailboxId);
+        outState.putLong(BUNDLE_KEY_MESSAGE_ID, mCurrentMessageId);
+    }
+
+    @Override
+    public void restoreInstanceState(Bundle savedInstanceState) {
+        super.restoreInstanceState(savedInstanceState);
+        mCurrentAccountId = savedInstanceState.getLong(BUNDLE_KEY_ACCOUNT_ID, NO_ACCOUNT);
+        mCurrentMailboxId = savedInstanceState.getLong(BUNDLE_KEY_MAILBOX_ID, NO_MAILBOX);
+        mCurrentMessageId = savedInstanceState.getLong(BUNDLE_KEY_MESSAGE_ID, NO_MESSAGE);
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.email_activity_one_pane;
     }
 
+    @Override
+    public void onActivityViewReady() {
+        super.onActivityViewReady();
+        mActionBarController = new ActionBarController(mActivity, mActivity.getLoaderManager(),
+                mActivity.getActionBar(), mActionBarControllerCallback);
+
+        mMessageCommandButtons = UiUtilities.getView(mActivity, R.id.message_command_buttons);
+        mMessageCommandButtons.setCallback(new CommandButtonCallback());
+    }
+
+    @Override
+    public void onActivityCreated() {
+        super.onActivityCreated();
+        mActionBarController.onActivityCreated();
+    }
+
+    @Override
+    public void onActivityResume() {
+        super.onActivityResume();
+        refreshActionBar();
+    }
+
     @Override
     public long getUIAccountId() {
-        return -1;
+        return mCurrentAccountId;
+    }
+
+    private long getMailboxId() {
+        return mCurrentMailboxId;
+    }
+
+    private long getMessageId() {
+        return mCurrentMessageId;
+    }
+
+    private void refreshActionBar() {
+        if (mActionBarController != null) {
+            mActionBarController.refresh();
+        }
+        mActivity.invalidateOptionsMenu();
+    }
+
+    private boolean isMailboxListVisible() {
+        return (getMailboxId() == NO_MAILBOX);
+    }
+
+    private boolean isMessageListVisible() {
+        return (getMailboxId() != NO_MAILBOX) && (getMessageId() == NO_MESSAGE);
+    }
+
+    private boolean isMessageViewVisible() {
+        return (getMailboxId() != NO_MAILBOX) && (getMessageId() != NO_MESSAGE);
     }
 
     @Override
     public boolean onBackPressed(boolean isSystemBackKey) {
-        return false;
+        if (isMessageViewVisible()) {
+            open(getUIAccountId(), getMailboxId(), NO_MESSAGE);
+            return true;
+        } else if (isMessageListVisible()) {
+            open(getUIAccountId(), NO_MAILBOX, NO_MESSAGE);
+            return true;
+        } else {
+            // STOPSHIP Remove this and return false.  This is so that the app can be closed
+            // with the UP press.  (usuful when the device doesn't have a HW back key.)
+            mActivity.finish();
+            return true;
+//          return false;
+        }
     }
 
     @Override
-    public boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu) {
-        return false;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(MenuInflater inflater, Menu menu) {
-        return false;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return false;
-    }
-
-    @Override
-    public void open(long accountId, long mailboxId, long messageId) {
+    void installFragment(Fragment fragment) {
+        super.installFragment(fragment);
+        if (fragment instanceof MailboxListFragment) {
+            ((MailboxListFragment) fragment).setCallback(mMailboxListFragmentCallback);
+        } else if (fragment instanceof MessageListFragment) {
+            ((MessageListFragment) fragment).setCallback(mMessageListFragmentCallback);
+        } else if (fragment instanceof MessageViewFragment) {
+            ((MessageViewFragment) fragment).setCallback(mMessageViewFragmentCallback);
+        } else {
+            // Ignore -- uninteresting fragments such as dialogs.
+        }
     }
 
     @Override
     public void openAccount(long accountId) {
+        open(accountId, NO_MAILBOX, NO_MESSAGE);
+    }
+
+    @Override
+    public void open(final long accountId, final long mailboxId, final long messageId) {
+        if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
+            Log.d(Logging.LOG_TAG, this + " open accountId=" + accountId
+                    + " mailboxId=" + mailboxId + " messageId=" + messageId);
+        }
+        if (accountId == NO_ACCOUNT) {
+            throw new IllegalArgumentException();
+        }
+
+        // !!! It's all temporary to make 1 pane UI (barely) usable !!!
+        //
+        // - Nested folders still doesn't work
+        // - When opening a child view (e.g. message list -> message view), we should retain
+        //   the current fragment so that all the state (selection, scroll position, etc) will be
+        //   restored when back.
+
+        if ((getUIAccountId() == accountId) && (getMailboxId() == mailboxId)
+                && (getMessageId() == messageId)) {
+            return;
+        }
+
+        final FragmentManager fm = mActivity.getFragmentManager();
+        final FragmentTransaction ft = fm.beginTransaction();
+
+        if (messageId != NO_MESSAGE) {
+            ft.replace(R.id.fragment_placeholder, MessageViewFragment.newInstance(messageId));
+
+        } else if (mailboxId != NO_MAILBOX) {
+            ft.replace(R.id.fragment_placeholder, MessageListFragment.newInstance(mailboxId));
+
+        } else {
+            ft.replace(R.id.fragment_placeholder,
+                    MailboxListFragment.newInstance(accountId, Mailbox.PARENT_KEY_NONE));
+        }
+
+        mCurrentAccountId = accountId;
+        mCurrentMailboxId = mailboxId;
+        mCurrentMessageId = messageId;
+
+        commitFragmentTransaction(ft);
+
+        refreshActionBar();
     }
 
     /*
@@ -74,7 +408,8 @@ class UIControllerOnePane extends UIControllerBase {
      */
     @Override
     public long getMailboxSettingsMailboxId() {
-        // Mailbox settigns is still experimental, and doesn't have to work on the phone.
+        // Mailbox settings is still experimental, and doesn't have to work on the phone.
+        Utility.showToast(mActivity, "STOPSHIP: Mailbox settings not supported on 1 pane");
         return -1;
     }
 
@@ -84,6 +419,51 @@ class UIControllerOnePane extends UIControllerBase {
     @Override
     public long getSearchMailboxId() {
         // Search is still experimental, and doesn't have to work on the phone.
+        Utility.showToast(mActivity, "STOPSHIP: Search not supported on 1 pane");
         return -1;
     }
+
+    private class CommandButtonCallback implements MessageCommandButtonView.Callback {
+        @Override
+        public void onMoveToNewer() {
+            // TODO
+        }
+
+        @Override
+        public void onMoveToOlder() {
+            // TODO
+        }
+    }
+
+    @Override
+    protected boolean isRefreshEnabled() {
+        // Refreshable only when an actual account is selected, and message view isn't shown.
+        // (i.e. only available on the mailbox list or the message view, but not on the combined
+        // one)
+        return isActualAccountSelected() && !isMessageViewVisible();
+    }
+
+    @Override
+    public void onRefresh() {
+        if (!isRefreshEnabled()) {
+            return;
+        }
+        if (isMessageListVisible()) {
+            mRefreshManager.refreshMessageList(getActualAccountId(), getMailboxId(), true);
+        } else {
+            mRefreshManager.refreshMailboxList(getActualAccountId());
+        }
+    }
+
+    @Override
+    protected boolean isRefreshInProgress() {
+        if (!isRefreshEnabled()) {
+            return false;
+        }
+        if (isMessageListVisible()) {
+            return mRefreshManager.isMessageListRefreshing(getMailboxId());
+        } else {
+            return mRefreshManager.isMailboxListRefreshing(getActualAccountId());
+        }
+    }
 }
diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java
index 9f81c891e..90aa2ccdf 100644
--- a/src/com/android/email/activity/UIControllerTwoPane.java
+++ b/src/com/android/email/activity/UIControllerTwoPane.java
@@ -22,7 +22,6 @@ import com.android.email.Preferences;
 import com.android.email.R;
 import com.android.email.RefreshManager;
 import com.android.email.activity.setup.AccountSecurity;
-import com.android.email.activity.setup.AccountSettingsXL;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.provider.EmailContent.Account;
 import com.android.emailcommon.provider.EmailContent.Mailbox;
@@ -36,9 +35,6 @@ import android.app.FragmentTransaction;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
 import java.security.InvalidParameterException;
 import java.util.Set;
@@ -53,9 +49,6 @@ class UIControllerTwoPane extends UIControllerBase implements
         MailboxListFragment.Callback,
         MessageListFragment.Callback,
         MessageViewFragment.Callback {
-    private static final String BUNDLE_KEY_ACCOUNT_ID = "UIControllerTwoPane.state.account_id";
-    private static final String BUNDLE_KEY_MAILBOX_ID = "UIControllerTwoPane.state.mailbox_id";
-    private static final String BUNDLE_KEY_MESSAGE_ID = "UIControllerTwoPane.state.message_id";
     private static final String BUNDLE_KEY_MAILBOX_STACK
             = "UIControllerTwoPane.state.mailbox_stack";
 
@@ -102,7 +95,6 @@ class UIControllerTwoPane extends UIControllerBase implements
 
     private MailboxFinder mMailboxFinder;
 
-    private final RefreshListener mRefreshListener = new RefreshListener();
     private MessageOrderManager mOrderManager;
     private final MessageOrderManagerCallback mMessageOrderManagerCallback =
         new MessageOrderManagerCallback();
@@ -383,9 +375,7 @@ class UIControllerTwoPane extends UIControllerBase implements
      */
     @Override
     public void onActivityViewReady() {
-        if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
-            Log.d(Logging.LOG_TAG, this + " onActivityViewReady");
-        }
+        super.onActivityViewReady();
         mActionBarController = new ActionBarController(mActivity, mActivity.getLoaderManager(),
                 mActivity.getActionBar(), mActionBarControllerCallback);
 
@@ -407,17 +397,6 @@ class UIControllerTwoPane extends UIControllerBase implements
         return mAccountId;
     }
 
-    /**
-     * @return the currently selected account ID.  If the current view is the combined view,
-     * it'll return {@link #NO_ACCOUNT}.
-     *
-     * @see #getUIAccountId()
-     */
-    @Override
-    public long getActualAccountId() {
-        return mAccountId == Account.ACCOUNT_ID_COMBINED_VIEW ? NO_ACCOUNT : mAccountId;
-    }
-
     /**
      * Returns the id of the mailbox used for the message list fragment.
      * IMPORTANT: Do not confuse this with {@link #mMailboxListMailboxId} which is the id used
@@ -449,25 +428,19 @@ class UIControllerTwoPane extends UIControllerBase implements
         return mMessageId;
     }
 
-    /**
-     * @return true if an account is selected, or the current view is the combined view.
-     */
-    public boolean isAccountSelected() {
-        return getUIAccountId() != NO_ACCOUNT;
-    }
-
-    public boolean isMailboxSelected() {
+    private boolean isMailboxSelected() {
         return getMessageListMailboxId() != NO_MAILBOX;
     }
 
-    public boolean isMessageSelected() {
+    private boolean isMessageSelected() {
         return getMessageId() != NO_MESSAGE;
     }
 
     /**
      * @return true if refresh is in progress for the current mailbox.
      */
-    public boolean isRefreshInProgress() {
+    @Override
+    protected boolean isRefreshInProgress() {
         long messageListMailboxId = getMessageListMailboxId();
         return (messageListMailboxId >= 0)
                 && mRefreshManager.isMessageListRefreshing(messageListMailboxId);
@@ -476,7 +449,8 @@ class UIControllerTwoPane extends UIControllerBase implements
     /**
      * @return true if the UI should enable the "refresh" command.
      */
-    public boolean isRefreshEnabled() {
+    @Override
+    protected boolean isRefreshEnabled() {
         // - Don't show for combined inboxes, but
         // - Show even for non-refreshable mailboxes, in which case we refresh the mailbox list
         return -1 != getActualAccountId();
@@ -488,7 +462,6 @@ class UIControllerTwoPane extends UIControllerBase implements
     @Override
     public void onActivityCreated() {
         super.onActivityCreated();
-        mRefreshManager.registerListener(mRefreshListener);
         mActionBarController.onActivityCreated();
     }
 
@@ -525,7 +498,6 @@ class UIControllerTwoPane extends UIControllerBase implements
     @Override
     public void onActivityDestroy() {
         closeMailboxFinder();
-        mRefreshManager.unregisterListener(mRefreshListener);
         super.onActivityDestroy();
     }
 
@@ -924,43 +896,6 @@ class UIControllerTwoPane extends UIControllerBase implements
         return false;
     }
 
-    /**
-     * Handles {@link android.app.Activity#onCreateOptionsMenu} callback.
-     */
-    @Override
-    public boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu) {
-        inflater.inflate(R.menu.email_activity_options, menu);
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean onPrepareOptionsMenu(MenuInflater inflater, Menu menu) {
-        ActivityHelper.updateRefreshMenuIcon(menu.findItem(R.id.refresh),
-                isRefreshEnabled(),
-                isRefreshInProgress());
-        return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                // Comes from the action bar when the app icon on the left is pressed.
-                // It works like a back press, but it won't close the activity.
-                return onBackPressed(false);
-            case R.id.compose:
-                return onCompose();
-            case R.id.refresh:
-                onRefresh();
-                return true;
-            case R.id.account_settings:
-                return onAccountSettings();
-        }
-        return false;
-    }
-
     /** {@inheritDoc} */
     @Override
     public boolean onBackPressed(boolean isSystemBackKey) {
@@ -979,25 +914,6 @@ class UIControllerTwoPane extends UIControllerBase implements
         return false;
     }
 
-    /**
-     * Handles the "Compose" option item.  Opens the message compose activity.
-     */
-    private boolean onCompose() {
-        if (!isAccountSelected()) {
-            return false; // this shouldn't really happen
-        }
-        MessageCompose.actionCompose(mActivity, getActualAccountId());
-        return true;
-    }
-
-    /**
-     * Handles the "Compose" option item.  Opens the settings activity.
-     */
-    private boolean onAccountSettings() {
-        AccountSettingsXL.actionSettings(mActivity, getActualAccountId());
-        return true;
-    }
-
     /**
      * Handles the "refresh" option item.  Opens the settings activity.
      * TODO used by experimental code in the activity -- otherwise can be private.
@@ -1009,29 +925,6 @@ class UIControllerTwoPane extends UIControllerBase implements
                 getMessageListMailboxId()).cancelPreviousAndExecuteParallel();
     }
 
-    /**
-     * Start/stop the "refresh" animation on the action bar according to the current refresh state.
-     *
-     * (We start the animation if {@link UIControllerTwoPane#isRefreshInProgress} returns true,
-     * and stop otherwise.)
-     */
-    private void updateRefreshProgress() {
-        mActivity.invalidateOptionsMenu();
-    }
-
-    private class RefreshListener
-            implements RefreshManager.Listener {
-        @Override
-        public void onMessagingError(final long accountId, long mailboxId, final String message) {
-            updateRefreshProgress();
-        }
-
-        @Override
-        public void onRefreshStatusChanged(long accountId, long mailboxId) {
-            updateRefreshProgress();
-        }
-    }
-
     /**
      * Class to handle refresh.
      *
diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java
index de5541f7b..4d2ee4d04 100644
--- a/src/com/android/email/activity/Welcome.java
+++ b/src/com/android/email/activity/Welcome.java
@@ -23,14 +23,12 @@ import com.android.email.provider.AccountBackupRestore;
 import com.android.email.service.MailService;
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.EmailContent.Mailbox;
 import com.android.emailcommon.utility.EmailAsyncTask;
 import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -77,16 +75,6 @@ public class Welcome extends Activity {
 
     private final EmailAsyncTask.Tracker mTaskTracker = new EmailAsyncTask.Tracker();
 
-    /**
-     * @return true if the obsolete phone UI should be used.
-     *
-     * STOPSHIP remove this. temporary support for the old activities.
-     */
-    public static boolean useOldPhoneActivities(Context context) {
-        final int screenLayout = context.getResources().getConfiguration().screenLayout;
-        return (screenLayout & Configuration.SCREENLAYOUT_SIZE_XLARGE) == 0;
-    }
-
     /**
      * Launch this activity.  Note:  It's assumed that this activity is only called as a means to
      * 'reset' the UI state; Because of this, it is always launched with FLAG_ACTIVITY_CLEAR_TOP,
@@ -244,39 +232,20 @@ public class Welcome extends Activity {
             } else {
                 final long accountId = resolveAccountId(mFromActivity, mAccountId, mAccountUuid);
 
-                // Use the old phone activities on x-large devices, only when the debug pane mode
-                // is not specified.
-                // If the debug pane mode is specified, always use EmailActivity.
-                // STOPSHIP remove this. temporary support for the old activities.
-                final boolean useOldPhoneActivities = mDebugPaneMode == 0
-                        && useOldPhoneActivities(mFromActivity);
-
-                if (!useOldPhoneActivities) {
-                    final Intent i;
-                    if (isMessageSelected()) {
-                        i = EmailActivity.createOpenMessageIntent(mFromActivity, accountId,
-                                mMailboxId, mMessageId);
-                    } else if (isMailboxSelected()) {
-                        i = EmailActivity.createOpenMailboxIntent(mFromActivity, accountId,
-                                    mMailboxId);
-                    } else {
-                        i = EmailActivity.createOpenAccountIntent(mFromActivity, accountId);
-                    }
-                    if (mDebugPaneMode != 0) {
-                        EmailActivity.forcePaneMode(i, mDebugPaneMode == 2);
-                    }
-                    mFromActivity.startActivity(i);
+                final Intent i;
+                if (isMessageSelected()) {
+                    i = EmailActivity.createOpenMessageIntent(mFromActivity, accountId,
+                            mMailboxId, mMessageId);
+                } else if (isMailboxSelected()) {
+                    i = EmailActivity.createOpenMailboxIntent(mFromActivity, accountId,
+                                mMailboxId);
                 } else {
-                    // STOPSHIP remove this. temporary support for the old activities.
-                    if (isMessageSelected()) {
-                        MessageView.actionView(mFromActivity, mMessageId, mMailboxId);
-                    } else if (isMailboxSelected()) {
-                        MessageList.actionHandleMailbox(mFromActivity, mMailboxId);
-                    } else {
-                        MessageList.actionHandleAccount(
-                                mFromActivity, accountId, Mailbox.TYPE_INBOX);
-                    }
+                    i = EmailActivity.createOpenAccountIntent(mFromActivity, accountId);
                 }
+                if (mDebugPaneMode != 0) {
+                    EmailActivity.forcePaneMode(i, mDebugPaneMode == 2);
+                }
+                mFromActivity.startActivity(i);
             }
             return null;
         }
diff --git a/tests/src/com/android/email/activity/AccountsAdapterTest.java b/tests/src/com/android/email/activity/AccountsAdapterTest.java
deleted file mode 100644
index 16000551a..000000000
--- a/tests/src/com/android/email/activity/AccountsAdapterTest.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.emailcommon.provider.EmailContent.Account;
-import com.android.emailcommon.provider.EmailContent.Mailbox;
-
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.MergeCursor;
-import android.database.MatrixCursor.RowBuilder;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-/**
- * Basic unit tests of AccountsAdapter
- */
-@SmallTest
-public class AccountsAdapterTest extends AndroidTestCase {
-
-    private Cursor mUpperCursor = null;
-    private Cursor mLowerCursor = null;
-
-    /**
-     * Make an empty set of magic mailboxes in mUpperCursor
-     */
-    private void setupUpperCursor() {
-        MatrixCursor childCursor = new MatrixCursor(AccountsAdapter.MAILBOX_PROJECTION);
-        mUpperCursor = childCursor;
-    }
-
-    /**
-     * Make a simple set of magic mailboxes in mUpperCursor
-     */
-    private void populateUpperCursor() {
-        MatrixCursor childCursor = (MatrixCursor) mUpperCursor;
-
-        int count;
-        RowBuilder row;
-        // TYPE_INBOX
-        count = 10;
-        row = childCursor.newRow();
-        row.add(Long.valueOf(Mailbox.QUERY_ALL_INBOXES));       // MAILBOX_COLUMN_ID = 0;
-        row.add("Inbox");                                       // MAILBOX_DISPLAY_NAME
-        row.add(null);                                          // MAILBOX_ACCOUNT_KEY = 2;
-        row.add(Integer.valueOf(Mailbox.TYPE_INBOX));           // MAILBOX_TYPE = 3;
-        row.add(Integer.valueOf(count));                        // MAILBOX_UNREAD_COUNT = 4;
-        // TYPE_MAIL (FAVORITES)
-        count = 20;
-        row = childCursor.newRow();
-        row.add(Long.valueOf(Mailbox.QUERY_ALL_FAVORITES));     // MAILBOX_COLUMN_ID = 0;
-        row.add("Favorites");                                   // MAILBOX_DISPLAY_NAME
-        row.add(null);                                          // MAILBOX_ACCOUNT_KEY = 2;
-        row.add(Integer.valueOf(Mailbox.TYPE_MAIL));            // MAILBOX_TYPE = 3;
-        row.add(Integer.valueOf(count));                        // MAILBOX_UNREAD_COUNT = 4;
-        // TYPE_DRAFTS
-        count = 30;
-        row = childCursor.newRow();
-        row.add(Long.valueOf(Mailbox.QUERY_ALL_DRAFTS));        // MAILBOX_COLUMN_ID = 0;
-        row.add("Drafts");                                      // MAILBOX_DISPLAY_NAME
-        row.add(null);                                          // MAILBOX_ACCOUNT_KEY = 2;
-        row.add(Integer.valueOf(Mailbox.TYPE_DRAFTS));          // MAILBOX_TYPE = 3;
-        row.add(Integer.valueOf(count));                        // MAILBOX_UNREAD_COUNT = 4;
-        // TYPE_OUTBOX
-        count = 40;
-        row = childCursor.newRow();
-        row.add(Long.valueOf(Mailbox.QUERY_ALL_OUTBOX));        // MAILBOX_COLUMN_ID = 0;
-        row.add("Outbox");                                      // MAILBOX_DISPLAY_NAME
-        row.add(null);                                          // MAILBOX_ACCOUNT_KEY = 2;
-        row.add(Integer.valueOf(Mailbox.TYPE_OUTBOX));          // MAILBOX_TYPE = 3;
-        row.add(Integer.valueOf(count));                        // MAILBOX_UNREAD_COUNT = 4;
-    }
-
-    /**
-     * Make an empty set of accounts in mLowerCursor
-     */
-    private void setupLowerCursor() {
-        MatrixCursor childCursor = new MatrixCursor(Account.CONTENT_PROJECTION);
-        mLowerCursor = childCursor;
-    }
-
-    /**
-     * Make a simple set of "accounts".
-     * Note:  We don't fill in the entire width of the projection because the accounts adapter
-     * only looks at a few of the columns anyway.
-     */
-    private void populateLowerCursor() {
-        MatrixCursor childCursor = (MatrixCursor) mLowerCursor;
-
-        RowBuilder row;
-        // Account #1
-        row = childCursor.newRow();
-        row.add(Long.valueOf(1));                               // CONTENT_ID_COLUMN = 0;
-        row.add("Account 1");                                   // CONTENT_DISPLAY_NAME_COLUMN = 1;
-        row.add("account1@android.com");                        // CONTENT_EMAIL_ADDRESS_COLUMN = 2;
-        // Account #2
-        row = childCursor.newRow();
-        row.add(Long.valueOf(2));                               // CONTENT_ID_COLUMN = 0;
-        row.add("Account 2");                                   // CONTENT_DISPLAY_NAME_COLUMN = 1;
-        row.add("account2@android.com");                        // CONTENT_EMAIL_ADDRESS_COLUMN = 2;
-    }
-
-    /**
-     * Test: General handling of separator
-     */
-    public void testSeparator() {
-        // Test with fully populated upper and lower sections
-        setupUpperCursor();
-        populateUpperCursor();
-        setupLowerCursor();
-        populateLowerCursor();
-        AccountsAdapter adapter = AccountsAdapter.getInstance(mUpperCursor, mLowerCursor,
-                getContext(), -1, null);
-        checkAdapter("fully populated", adapter, mUpperCursor, mLowerCursor);
-
-        // Test with empty upper and populated lower
-        setupUpperCursor();
-        setupLowerCursor();
-        populateLowerCursor();
-        adapter = AccountsAdapter.getInstance(mUpperCursor, mLowerCursor, getContext(), -1, null);
-        checkAdapter("lower populated", adapter, mUpperCursor, mLowerCursor);
-
-        // Test with both empty
-        setupUpperCursor();
-        setupLowerCursor();
-        adapter = AccountsAdapter.getInstance(mUpperCursor, mLowerCursor, getContext(), -1, null);
-        checkAdapter("both empty", adapter, mUpperCursor, mLowerCursor);
-    }
-
-    /**
-     * Helper to check the various APIs related to the upper/lower separator
-     */
-    private void checkAdapter(String tag, AccountsAdapter adapter, Cursor upper, Cursor lower) {
-        // Check total count
-        int expectedCount = 0;
-        if (upper != null) expectedCount += upper.getCount();
-        if (lower != null) expectedCount += lower.getCount();
-        // If one or more items are shown, the adapter inserts the separator as well
-        if (expectedCount > 0) expectedCount++;
-        assertEquals(tag, expectedCount, adapter.getCount());
-
-        // Check separator-related APIs
-        int separatorIndex = -1;
-        if (upper != null) {
-            separatorIndex = upper.getCount();
-        }
-
-        // Get the MergeCursor that the adapter created
-        MergeCursor mc = (MergeCursor) adapter.getCursor();
-
-        // Check APIs for the position above the separator index
-        // This will be the last entry in the "upper" cursor
-        if (separatorIndex > 0) {
-            int checkIndex = separatorIndex - 1;
-            assertTrue(tag, adapter.isMailbox(checkIndex));
-            assertFalse(tag, adapter.isAccount(checkIndex));
-            assertTrue(tag, adapter.isEnabled(checkIndex));
-            Cursor c = (Cursor) adapter.getItem(checkIndex);
-            assertEquals(tag, mc, c);
-            assertEquals(tag, checkIndex, c.getPosition());
-            upper.moveToLast();
-            long id = upper.getLong(0);
-            assertEquals(tag, id, adapter.getItemId(checkIndex));
-        }
-
-        // Check APIs for position at the separator index
-        if (separatorIndex >= 0) {
-            int checkIndex = separatorIndex;
-            assertFalse(tag, adapter.isMailbox(checkIndex));
-            assertFalse(tag, adapter.isAccount(checkIndex));
-            assertFalse(tag, adapter.isEnabled(checkIndex));
-            // getItem and getItemId should never be called because it should not be enabled
-        }
-
-        // Check APIs for the position below the separator index
-        // This will be the first entry in the "lower" cursor
-        if (lower != null && lower.getCount() > 0) {
-            int checkIndex = separatorIndex + 1;
-            assertFalse(tag, adapter.isMailbox(checkIndex));
-            assertTrue(tag, adapter.isAccount(checkIndex));
-            assertTrue(tag, adapter.isEnabled(checkIndex));
-            Cursor c = (Cursor) adapter.getItem(checkIndex);
-            assertEquals(tag, mc, c);
-            assertEquals(tag, separatorIndex, c.getPosition());
-            lower.moveToFirst();
-            long id = lower.getLong(0);
-            assertEquals(tag, id, adapter.getItemId(checkIndex));
-        }
-    }
-
-    /**
-     * Test: isOnDeletingAccountView
-     */
-    public void testDeletingAccount() {
-        // Test with fully populated upper and lower sections
-        setupUpperCursor();
-        populateUpperCursor();
-        setupLowerCursor();
-        populateLowerCursor();
-        AccountsAdapter adapter = AccountsAdapter.getInstance(mUpperCursor, mLowerCursor,
-                getContext(), -1, null);
-
-        // Check enabled state - all should be enabled except for separator
-        for (int i = 0; i < adapter.getCount(); i++) {
-            boolean expectEnabled = adapter.isMailbox(i) || adapter.isAccount(i);
-            assertEquals(expectEnabled, adapter.isEnabled(i));
-        }
-
-        // "Delete" the first account
-        adapter.addOnDeletingAccount(1);                    // account Id of 1st account
-        int account1Position = mUpperCursor.getCount() + 1; // first entry after separator
-        for (int i = 0; i < adapter.getCount(); i++) {
-            boolean isNotSeparator = adapter.isMailbox(i) || adapter.isAccount(i);
-            boolean expectEnabled = isNotSeparator && (i != account1Position);
-            assertEquals(expectEnabled, adapter.isEnabled(i));
-        }
-    }
-
-    /**
-     * Test: callback(s)
-     */
-    public void testCallbacks() {
-        // Test with fully populated upper and lower sections
-        setupUpperCursor();
-        populateUpperCursor();
-        setupLowerCursor();
-        populateLowerCursor();
-        Callback cb = new Callback();
-        AccountsAdapter adapter = AccountsAdapter.getInstance(mUpperCursor, mLowerCursor,
-                getContext(), -1, cb);
-
-        AccountFolderListItem itemView = new AccountFolderListItem(mContext);
-        itemView.mAccountId = 1;
-        adapter.onClickFolder(itemView);
-        assertTrue(cb.called);
-        assertEquals(1, cb.id);
-    }
-
-    private static class Callback implements AccountsAdapter.Callback {
-        public boolean called = false;
-        public long id = -1;
-
-        public void onClickAccountFolders(long accountId) {
-            called = true;
-            id = accountId;
-        }
-    }
-
-    /**
-     * Tests for cursor management.  Make sure that the underlying cursor is closed properly
-     * when we set the cursor to null.
-     */
-    public void testCursorManagement() {
-        setupUpperCursor();
-        setupLowerCursor();
-        AccountsAdapter adapter = AccountsAdapter.getInstance(mUpperCursor, mLowerCursor,
-                getContext(), -1, null);
-
-        Cursor c = adapter.getCursor();
-        assertFalse(c.isClosed());
-        adapter.changeCursor(null);
-        assertTrue(c.isClosed());
-    }
-}
diff --git a/tests/src/com/android/email/activity/MessageFileViewTest.java b/tests/src/com/android/email/activity/MessageFileViewTest.java
index c819da09a..e93b90a0d 100644
--- a/tests/src/com/android/email/activity/MessageFileViewTest.java
+++ b/tests/src/com/android/email/activity/MessageFileViewTest.java
@@ -27,7 +27,7 @@ import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
- * Test case for {@link MessageTestView}.
+ * Test case for {@link MessageFileView}.
  *
  * TODO Add more tests.  Any good way to test fragment??
  */
@@ -49,7 +49,7 @@ public class MessageFileViewTest extends ActivityInstrumentationTestCase2<Messag
     }
 
     private void setUpIntent(Uri uri) {
-        final Intent i = new Intent(getInstrumentation().getTargetContext(), MessageView.class);
+        final Intent i = new Intent(getInstrumentation().getTargetContext(), MessageFileView.class);
         i.setData(uri);
         setActivityIntent(i);
     }
diff --git a/tests/src/com/android/email/activity/MessageViewTest.java b/tests/src/com/android/email/activity/MessageViewTest.java
deleted file mode 100644
index 77855e1ec..000000000
--- a/tests/src/com/android/email/activity/MessageViewTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email.activity;
-
-import com.android.email.DBTestHelper;
-import com.android.email.TestUtils;
-
-import android.content.Context;
-import android.content.Intent;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * Test case for {@link MessageView}.
- *
- * TODO Add more tests.  Any good way to test fragment??
- */
-public class MessageViewTest extends ActivityInstrumentationTestCase2<MessageView> {
-    private static final String EXTRA_MESSAGE_ID = "com.android.email.MessageView_message_id";
-    private static final String EXTRA_DISABLE_REPLY =
-            "com.android.email.MessageView_disable_reply";
-    private static final String EXTRA_MAILBOX_ID = "com.android.email.MessageView_mailbox_id";
-
-    private static int TIMEOUT = 10; // in seconds
-
-    private Context mProviderContext;
-
-    public MessageViewTest() {
-        super(MessageView.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mProviderContext = DBTestHelper.ProviderContextSetupHelper.getProviderContext(
-                getInstrumentation().getTargetContext());
-    }
-
-    private void setUpIntent(long messageId, long mailboxId, boolean disableReply) {
-        final Intent i = new Intent(getInstrumentation().getTargetContext(), MessageView.class);
-        i.putExtra(EXTRA_MESSAGE_ID, messageId);
-        i.putExtra(EXTRA_MAILBOX_ID, mailboxId);
-        if (disableReply) {
-            i.putExtra(EXTRA_DISABLE_REPLY, true);
-        }
-        setActivityIntent(i);
-    }
-
-    /**
-     * Open the activity without setting an Intent.
-     *
-     * Expected: Activity will close itself.
-     */
-    public void testCreateWithoutParamter() throws Throwable {
-        // No intent parameters specified.  The activity will close itself.
-        final MessageView activity = getActivity();
-
-        TestUtils.waitUntil("", new TestUtils.Condition() {
-            @Override
-            public boolean isMet() {
-                return activity.isFinishing();
-            }
-        }, TIMEOUT);
-    }
-
-    // This test doesn't work, because it sets up messages in an separated context, but
-    // the main activity looks at the actual context and fails to find the message.
-//    /**
-//     * Set up account/mailbox/message, and open the activity.
-//     *
-//     * Expected: Message opens.
-//     */
-//    public void testOpenMessage() throws Exception {
-//        final Context c = mProviderContext;
-//        final Account acct1 = ProviderTestUtils.setupAccount("test1", true, c);
-//        final Account acct2 = ProviderTestUtils.setupAccount("test2", true, c);
-//        final Mailbox acct2inbox = ProviderTestUtils.setupMailbox("inbox", acct2.mId, true, c);
-//        final Message msg1 = ProviderTestUtils.setupMessage("message1", acct2.mId, acct2inbox.mId,
-//                true, true, c);
-//        final Message msg2 = ProviderTestUtils.setupMessage("message2", acct2.mId, acct2inbox.mId,
-//                true, true, c);
-//
-//        setUpIntent(msg2.mId, msg2.mMailboxKey, false);
-//
-//        final MessageView activity = getActivity();
-//
-//        TestUtils.waitUntil(new TestUtils.Condition() {
-//            @Override
-//            public boolean isMet() {
-//                MessageViewFragment f = activity.getFragment();
-//                return f != null && f.isMessageLoadedForTest();
-//            }
-//        }, TIMEOUT);
-//
-//        // TODO Check UI elements, once our UI is settled.
-//    }
-}