From b377fe84df3b3f711ff9f45300a425e04aaa6abc Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Thu, 19 Jul 2012 14:22:03 -0700
Subject: [PATCH] New design for Conversation Activity.

1) Move to Fragments for the list view.
2) Switch to CursorLoader from my jankey self-managed cursor.
3) Add session security logic to the ActionBar.
4) Fix colors to be less ugly.
---
 AndroidManifest.xml                           |   2 +-
 res/drawable-hdpi/ic_menu_attach.png          | Bin 0 -> 1555 bytes
 res/drawable-hdpi/ic_menu_call.png            | Bin 0 -> 1236 bytes
 res/drawable-hdpi/ic_menu_lock_holo_dark.png  | Bin 0 -> 765 bytes
 .../ic_menu_lock_unverified_holo_dark.png     | Bin 0 -> 2367 bytes
 .../ic_menu_lock_verified_holo_dark.png       | Bin 0 -> 2485 bytes
 res/drawable-mdpi/ic_menu_attach.png          | Bin 0 -> 993 bytes
 res/drawable-mdpi/ic_menu_call.png            | Bin 0 -> 861 bytes
 res/drawable-mdpi/ic_menu_lock_holo_dark.png  | Bin 0 -> 606 bytes
 .../ic_menu_lock_unverified_holo_dark.png     | Bin 0 -> 1490 bytes
 .../ic_menu_lock_verified_holo_dark.png       | Bin 0 -> 1619 bytes
 res/drawable-xhdpi/ic_menu_attach.png         | Bin 0 -> 2252 bytes
 res/drawable-xhdpi/ic_menu_call.png           | Bin 0 -> 1605 bytes
 res/drawable-xhdpi/ic_menu_lock_holo_dark.png | Bin 0 -> 1477 bytes
 .../ic_menu_lock_unverified_holo_dark.png     | Bin 0 -> 4131 bytes
 .../ic_menu_lock_verified_holo_dark.png       | Bin 0 -> 4607 bytes
 res/layout/compose_message_activity.xml       | 274 ------
 res/layout/conversation_activity.xml          | 210 +++++
 res/layout/conversation_fragment.xml          |  21 +
 res/menu/conversation.xml                     |  17 +
 res/menu/conversation_button_context.xml      |   5 +
 res/menu/conversation_context.xml             |  14 +
 res/menu/conversation_insecure.xml            |  13 +
 res/menu/conversation_secure_unverified.xml   |  19 +
 res/menu/conversation_secure_verified.xml     |  19 +
 .../securesms/ComposeMessageActivity.java     | 830 ------------------
 .../securesms/ConversationActivity.java       | 664 ++++++++++++++
 .../securesms/ConversationAdapter.java        |  92 +-
 .../securesms/ConversationFragment.java       | 176 ++++
 .../securesms/ConversationListActivity.java   |   2 +-
 .../crypto/AuthenticityCalculator.java        |  59 +-
 .../database/loaders/ConversationLoader.java  |  23 +
 32 files changed, 1265 insertions(+), 1175 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_menu_attach.png
 create mode 100644 res/drawable-hdpi/ic_menu_call.png
 create mode 100644 res/drawable-hdpi/ic_menu_lock_holo_dark.png
 create mode 100644 res/drawable-hdpi/ic_menu_lock_unverified_holo_dark.png
 create mode 100644 res/drawable-hdpi/ic_menu_lock_verified_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_menu_attach.png
 create mode 100644 res/drawable-mdpi/ic_menu_call.png
 create mode 100644 res/drawable-mdpi/ic_menu_lock_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_menu_lock_unverified_holo_dark.png
 create mode 100644 res/drawable-mdpi/ic_menu_lock_verified_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_menu_attach.png
 create mode 100644 res/drawable-xhdpi/ic_menu_call.png
 create mode 100644 res/drawable-xhdpi/ic_menu_lock_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_menu_lock_unverified_holo_dark.png
 create mode 100644 res/drawable-xhdpi/ic_menu_lock_verified_holo_dark.png
 delete mode 100644 res/layout/compose_message_activity.xml
 create mode 100644 res/layout/conversation_activity.xml
 create mode 100644 res/layout/conversation_fragment.xml
 create mode 100644 res/menu/conversation.xml
 create mode 100644 res/menu/conversation_button_context.xml
 create mode 100644 res/menu/conversation_context.xml
 create mode 100644 res/menu/conversation_insecure.xml
 create mode 100644 res/menu/conversation_secure_unverified.xml
 create mode 100644 res/menu/conversation_secure_verified.xml
 delete mode 100644 src/org/thoughtcrime/securesms/ComposeMessageActivity.java
 create mode 100644 src/org/thoughtcrime/securesms/ConversationActivity.java
 create mode 100644 src/org/thoughtcrime/securesms/ConversationFragment.java
 create mode 100644 src/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f45dc96755..ab3636ab38 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,7 @@
 
     <activity android:name=".AutoInitiateActivity" android:theme="@android:style/Theme.Dialog" android:label="TextSecure Messaging Detected" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".ApplicationPreferencesActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
-    <activity android:name=".ComposeMessageActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
+    <activity android:name=".ConversationActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".PassphraseCreateActivity" android:theme="@android:style/Theme.Dialog" android:label="Create Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".PassphrasePromptActivity" android:theme="@android:style/Theme.Dialog" android:label="Enter Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
     <activity android:name=".PassphraseChangeActivity" android:theme="@android:style/Theme.Dialog" android:label="Change Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
diff --git a/res/drawable-hdpi/ic_menu_attach.png b/res/drawable-hdpi/ic_menu_attach.png
new file mode 100644
index 0000000000000000000000000000000000000000..d491e8902853e2541c27260d31e76bf48d686193
GIT binary patch
literal 1555
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
FV1l#x+phos

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_menu_call.png b/res/drawable-hdpi/ic_menu_call.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8f54d7766a56f221e6ca903e5e7f9efd5b486ad
GIT binary patch
literal 1236
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3DScRXDjLn02pz3#mtq*R9e!+Fc}J;vpG%;hgI
zFYVA!6g0lwBI+{b0(X?irQQoC;%2i1du1ke<yK8#adlLf*0e1{aZ2~1TU$7TypOnc
zpWwRvWN+2n-?NJU={`GiXQp-W*LyRk{SABm=ehm;_wWDymi;$f+v7@|$g+Cw%`q=q
z6@2Em|8G)y#}RL>dv)XC8UcOx3CyZSsn)f*%>lbFa=QxG2(+khXdiz5(8og3uVw2`
z&+98Ln$+Y4K2zL1CD!TYdNawDM;Gn(IFkFp`Cd?gr&8d?OJTOIN_my%Y+jWnuM(Od
z@o|TH%Fk+ly{^=}l7O2b!nqp`Z1AlUKE10jcy;%@qOF}`tCfV;ZDo!u7dyhcz~|!J
zW4Go^-0>jpeD>;@KLs5QCb-)si|3TBUL)Q0Y=6&h?}fUNO(B7vE6v4OJFgVh>asX$
zZM^b+n}yyhH9kwnknYdr$D(pxZNB09o9E}Ydq19O2gY9g^ENm;<j79n=Q3Ygix=(s
z_Syfk)8%5N(j&6GzTEdd_PXelaNmEkC~BE}aa3fR&&9V{oH89%uU&V}7n=O-`Am`3
z6*r8o-gAp;R%jA&|C<n?Wt2H{;jg)Q(q(rZ{;f?Ga?H6R9Ok)u^+U5J8@`Rge3DZ-
zm$1FLqQCli;d`+w1$ISVk!ogHYp*{s<TKV|bL?=Ash-8`XcwNe_}i>W974)w6_ILr
zOEW_J%>G925OUO;dBgwS=743_eB(C--r~93z<(`DQ~2yOE@O^GnO)3$(TloHsNUwe
zsyS<0f5KkoZ`FPw^Q(;C&dA-|&7vwFksjeF@N)b4<ClG%RU#fuc&Zljw7PoE)GJ+^
zB)2tpOHGv6epg>?WfzNR^xKUAYJyL%o9*&sJ^b$DO!lR>RxL}OYW7y*bnS~YaS@i8
zu70<lrcZRa`jszILsaqV@)sM*W7qh;w<<X<l+|@)eq6z+q|k{+I-+Zmx{n6gJd+Ck
z`PAj=3PtucD?@!tEV<JnHeR{?t}Jd&d(i>;eMOhF*JTS_Q3;(^by;wtK<vB)t&5(7
z`mcJjb)x1g^UO`oVatBa-F~k{gKP7yjJCx}lkaVazS<ztsd@NVy5_w_`o2Er_iJx?
zbZl)zR;%na$=o-!Zzo9=T-to>)vxo39;R1%Qn}`RTjaP{Hut=a!8^(HS=$d-@=jiM
ze$pAP+jmt%S8i`-t67sWJ9%xU)$z=$8_Xwl+9qrc4NBfrGi_PduQz2oMC;;;_Z;n8
z^gDM$)XgQDos;&zoxAd{4QJFNL6(iT@1$>){`1(KeQs|1`y}DaQ>%62`MlIZU$WeP
zS{^uAb>fzjg|ZC0<2;?TkHu{MSD!h(p3(4s#LwHk3*3R3UbVzEq9i4;B-JXpC>2OC
z7#SEE>Ka(+8XJZf8d@2fSQ%RC8kk!d7)0y!{6o=@o1c=IR*74KR<Vf_P=h4MhT#0P
plJdl&R0hYC{G?O`&)mfH)S%SFl*+=BsWw1G44$rjF6*2UngC25B#{6B

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_menu_lock_holo_dark.png b/res/drawable-hdpi/ic_menu_lock_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..768a7e6088d6135b382eb01196d8dc2008b2ba27
GIT binary patch
literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00001b5ch_0Itp)
z=>Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RX2NMwt82gz_hyVZrk4Z#9R9M69
zmOW?`aS+9SZ|^R-7{QMi8<jf{u@Q-45s)BWryyF2wjvf*mUd#N2x1|mu(A;}g;<G|
z#6}S@D5662wlRhH6{995ch6$aaN^#&w|gLn(=5x*&YPL{X8wQpZ-3jA*0DaofQDHG
zey?}_R-Nx5K)9ZR9AK1TBMfhJkDI<({n8VFu*L;OqR_HY^v{wX=tSj7Zh-ojZZiP*
z7hfa8jB1tVxd6fqykPKWaKF`O#46VQ1Yz1E)w!ey#Xl5qok3dw&$z5do*~diMmfnQ
zBePlK9L-!oc*r*t0P>V-mG^Cpt1!tX8L{Be>f_Eag2em}6ClKQcDILzYN-9f0!kc7
z3XuR14ta}Y8=v`Ikd>#t7Ddp`dNErC>ojB}!9?u$t1UsT)tXEsyPrM)FX%%oeXm;2
zGUZGF3JAcc*}<XF(rUqltRyGPY|&ArfeP8@AjuZhO2Fi(Ai?YuPKf{}za;>8wneY`
z6zeb>@#7}5U2#}n!!7mMTH&oKft#9QG3MVsj|js&FE#H#(;TbJr65@)cG2J3&jtnT
z=-5Nal-Uk~K^N1isIgpH;xd%lJ=};RE$AJ!N=vemB-Nk^?jnn{gJwjNJ50Kyn#L?S
z-G!kTA1k)3(>`BqLU@j|I`zAg^G&kv`%1M5Q2ELwUgsDz#dqknJ}$q0U^)lM@e1+k
z=yU*}#86uGrIxAodfW2L9`ES2OijP;hWh}*<4h>sD(!+~VVAiGz&O}aW&n2{)M%B>
zL0tHpGHq*}x>+FUS4GBM)ZLj}s;^Wrb^E(o715V1JTxkk51?~?DzmjWXR>-nLcB~1
vnGT&o97J4;-g+Z)_vtTnxPAP$f8BlnTEWj6f|cd-00000NkvXXu0mjfaRFbe

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_menu_lock_unverified_holo_dark.png b/res/drawable-hdpi/ic_menu_lock_unverified_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..3400d3d167b027fafceeaac599e85afd29b52d57
GIT binary patch
literal 2367
zcmV-F3BdM=P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RX2NM(}8dn-{qyPX2(Md!>RA}Dq
zSxami*A+c?hQpsIQsPLo{1a(AwjqCIH#J-YN(%$+qC$VWqD2-d(k6?py2zrNw&<=!
zH(eAcio%O-8njIj6j~GoQUq@8`WxA`B+HR4Ql?~?9E#*{_?wycZWkOnv{KumOe+DB
z2Mh=fW-iaU_n!OieFQ#RpRG^#qFx(Jr_&(-AtD+E5CZ^aUL&FcGuKn8RO1s#Ad|@?
z0DJ?$*8rRbFwD##A}})mtPs(^0KCJ@@1#<x>L-RkCX+b>;8y^~J3$i>d!L=Z<1+Il
zB6=g4O#b&{Cy-93Cy40p07Bj^eu7;FKwd=d6VaJuGI{G`Baq2tb^@3O(6=5qGv|q@
z;@yh@h_5FC;0`m7r&1|vvlx8O7=S+k=woK?$dXwAzagS)%zPh!LPWbfUHlNh?sj?s
z*hfUa1@PT1k3c4q`6e^}nTV9OEoQ#%rN!D~(k%(#9Dv;(0Rqru=F_QEYI-v`lxOh%
zx4rktyKDe2Jq|noq*AF25q;GYdE0p!fbVP;gtAHR>&(2LyfVYgVCJ7~q%<az$(zjl
z$4(4HbTXYz`?fLyLqw#vOQe_of9c}=KRi;JnBzn=xMd<{<^TYH$M+@?6*nwAqPy$9
z2LS}PjDROx#RCr_l3kh*9pphoDl@BFE#fwr&AjG#n^~KLLPYA8MW6@EX%laMb`sjs
z2yAlkW&!t%K(7FNECiU@Tqj%xQ0~Hn*{L07mH^D>)=H$)=|KR0BO<@o_k@}GAQ5S8
z07P^hfV08h^)vH$$E?r*aGQu4o}ljt%liKEn{U?E;cSOpPE1YlhDGcFeGx#Qqx3yA
z=#|wI-3GGtDzUc*9BYf3rR=kpmO@^+RXZ|8diPwfb?K@KiT_hJH{A?&3^^aM!9vL9
z-MfCTP1igUZ43^8W>*9{JiZm>32+>8R#qb3kQDStzysd^P-|;uqbbyNYIJyv04N<Z
zz>|$h30bczqF5XNpxTxdyH+f2s|%riJ|4dxiAL8v@XOC*BWnYc0R92s95ZV~bcTo~
zTKa!H33eQaav5%^q{&)ssA`&#^M-M-U(-(d6~*_@T<+=_;6`6Gs&=&#cacKvhkne=
zzf7f4(rdqe0pRCE^rOe*JVdDkcXbuQG$CC#Xc@-N^M<j1G#oy4?AWoR%|b!__u^vz
zd-=TjGH~U&wGzyH5y0<Lsg%6(`s?J)0JTge^J@U#0<edf0cJo5u<L@GO|avDLLn$p
zqM6O&KPxN8_e3Hmj~qXKMAYkj0C0L}=)?uXkniSlRRDk8@J6;#4S11SB%;!}$w{hb
zvr0XiRnJXMDsG`rX68E`4}+P(LbNW&fowL>EEX|4KOfwsX{U}HJ$h8s>wQkS3<v==
z9PT?9iR`Po?zZO=0V0AFVz6=jdY@P7)V3z<Or|f`-#-LZ1*B|&c3p6z0a>p@SQeW3
zJZ{a-Lc4b_eBkimL!#LXIpuOIS^!r~)4X0T&kgzg*{)iNjr2WjZ^CuIr1bZ{2%x|7
zQseP2v*V1jZG#;LY}=6aI%KT|QK`Vr<#20e25LHuJ@I&8J$SQRE}l1xYbw#jFD4QT
zT@lz&3bnk-Y})~!u202ZdFAT>bO8F$Yp=bbgu`dK(SWGcxD8xdRtvo6c{QCzvcDgq
zT2(s1m&)bR#X?~^=J#Ki7#^PUM<Q!IO`*0&SxS<P2Fpex;2RwLiDjBUFdfG~90>eW
zm?ogAtf(qUDO(X}G+-MB=I7_3rqdXWMj@(ItOtL&P?(Mf0++^heNGJq9{?!!w2Vs2
z0*G39U9Xd@R#9GB67S}6X8`Dd>1q3gJ$w9WI80JeS^~ChGztaG-@c8&@-lX>1J6=&
z$u!rltgYRM2Lczzb$wP123G+TIy>Lqh}h?AMZn8z>%jxuoSyD`d3g9M1M&Fwxf?fB
zuGg_|_iiYm5FjNQ<uc|M7SMnHKDNi>5T*&IQfY%np<FhutgXGD2nMel*Y#U!FnAw;
z;d#H(6@jN|KnVsR8V#`HpjIqmZe|9%a=C~;Ha6y%rhk92$hT)_A*xmE+qn}?vx)ho
zB@E>A*giZAr&xqrtv&=_a$WaIxqM?+IDGkVBC$xSy1EX0qo)xdO?#L^tGOJovVvGR
z9BdW}ByAf$O{4vl3T`hfz_BdY%_iceiS3C*3%q4LOw}?o(gOpHQOmkI7K<(VbzOHY
zYldC76TJO=S_vXVLLn@LLda*c7*IYea+=?dgY`NV?%l(7pAREDcEBl>J_Ii%3;+)j
z3GCmyx7H7Q0Nc(fnpPuKy~VCuZVxeCpGrIpJli%v1oHVXv~3&qj*Vf#wh6f$VgSe!
zt}hhAp+EpyH2P8SM97VdVC={d43CU7&2)NIxb6~&(l5RJw%Lng6?!TGO@k5+W9R57
z;5hg|2*5B9ld?rZh*rCh&jUg{0{+3s2o4=PhT+jsD8Zmmbv-Lh^VX@eXYFS`7wR}Y
zdu%kw=K~Z4it7SGU`HwimJ)Yv-UJGTM@T%hD<vKfq2Pf}B$H60Q7C}`2lnn=6WQ!j
zXY7rpP@b80b^JZ_=&Wg3nw`xCglVeI@^VC!N&})&(fcZugfE+Y;bO5k{<&!Ms2+{#
zq$uRI&>~YRt<2VH?;o=5X-$Ylb78?yW3i$V3Kd<$Soy+RZ*fluB$G)7kblxMmtK99
znz@`0Km<V4D|w{@!Jz5*e3eUuLgN(kNj(-zfLYuv6f!fWdGT;GdNrwOcZFf(gkcoC
zX{*|Ke)^=PqDSj@)6@9gfdlMKW$aC5OsXn|gTZ>;wySfMiiiN=Rm;lFnC68OgM*h-
zy1qz?k^`{j?XWcfjfttL4H4*RJ3TQq#pfm`?R8C}R5VQ-)%AujjLLiYd{$GG=81uU
zx!v*jGAT;Yi&oq7P4C#GcL!VDu5*)<KJWj7pm#LV4<N!q^p!0uq!Ed5BvK_svAoU6
l@;u)J;7&|UNqkz?{{WM*{my86P{#lO002ovPDHLkV1iLJM*{!=

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_menu_lock_verified_holo_dark.png b/res/drawable-hdpi/ic_menu_lock_verified_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f2d34925421b61341b0d3a4268018e7c9557738
GIT binary patch
literal 2485
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

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_attach.png b/res/drawable-mdpi/ic_menu_attach.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b0e6ecaa7522d61851fe2b94ad81b6d1db099ff
GIT binary patch
literal 993
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE>PP`PZ!4!kK;$L`sRm(N-#WlevdoJ*@5%OrHc$)
zTN(n6=ow7fX1u*l=Z>VX^Pxk%d4E;)Vlzy3CA^FiKXRj~Q+{UEb3bqCl?R-H)`Uf6
zd2^Tab!RT0TgGKwYySM%lX>dzf7blmue{3K_N!Xl%eAKeL+VT}Y<6Qkd%t(z+RhfI
zT8{}YKJJ>nb!Tp5ONHs-rjzcz3)O{eo-(K36}NfW<*)OANw14Fakb8*V<L7X*RI=@
zax!z(iB(7MPhI?VYvx>6Cq=O@71zz}%CE0U%w;S2anQfd!?q+;XN#H;*Te_D?6qlO
zN=|vp8D;l{Ut9U4apT&K&;`dGr{57>sd(b8(Sp08hj&fUk<9m9!<73==d?@H-?-wl
z8<sDfR~Y$h#v<1J+mwX37`Mwz=nDPV$E_qf(>CZg&q|AR8TYoHbvcw`+kWSBP|vIj
zc?X1zX6_BD<~_A{MaH=!Zb_xm%HLDtCagLcA~WIEGNsM_S^bWo>R)Gnj5ZEDzo3p^
zER|1t<;oQn8loptZ!Im8HhMJ0t~@5*U*)TE(*`G*&`%DoM-^8pOuwnW_4ES4yT5#P
zZ*)^JDdI@_9#WzeHR-f$*p@X~mld~Oo)EbF>(9$)tu`{52y$!nY3@>=ZoTNq!c|@A
zQ+0k{+;REb&Uf2($gE+K?zmI<_gU!EKCMV2rOR(8y!V;?p-XSNt%l3wYzJXO{c@*^
zb5^bLbN#F_>(kmJ@j`#q?g;s}l{yH2>=y*OJJfX1>4rMf_!&an)4t3M6U}9q)nOUB
z{L9S1sgWgzT^}nk-d_4IAdfLe!L9VQY3`ZOnbt~<Iu+-n>kPGK@oe<n`03M?BY8hh
zO!@wmYuoK>6;I-(O61EtJ-bn_J2HIk#q3jOe;r=-Y|dx5+E#;`QW;8VJ(Zp(^SaA4
zDo$6{|Gu$i#hO6zDA&bdS4t|*OX}QG4EwnB{_E3`bs`(qC9!l0?|NgFerHCz_U?}s
z3CR~V*T?-WefrGMp*cdky7y3c-JJ{nHU6>A>ei7BSSHU3O#P}Qt`Q|Ei6yC4$wjF^
ziowXh&`{UFLf6<Z#L&pf$k@sl$ThbzFxXO)I~heoZhlH;S|x4`M-{K?12ss3YzWRz
qD=AMbN@Z|N$xljE@XSq2PYp^<OsOn9nQ8-6#Ng@b=d#Wzp$Py=RjSYc

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_call.png b/res/drawable-mdpi/ic_menu_call.png
new file mode 100644
index 0000000000000000000000000000000000000000..6df99c8bd8a0f87da6a566591697c408212642d9
GIT binary patch
literal 861
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE>K&lr;B5V$MLmOZ9S$2${eeIz9&EK^6ICTZcI?Q
zqHuTN!UbyWD^wOKvNy9W)#Z?pRf>wz3gFO`QO&r#!jR)l+g&!_#U?Eo!c5-!ufFbm
zo>^hPXQjFSm6_*$f3*4k{Qt)}%>Q?sxfb@-?uVdC!R(wT-ig}}$|^ek(a>*V(Q9E^
zxVUOr`zE80yZ1LnFU;F}dCk5TZcfj`nU_9VZ|E_TOHr|Q%7z_#wG$aq3g;xY7#(_a
z<Gj+|H3=8uSj0rSUogvvZJ1(ttRbFJCqY10CQbP*r{evcr&wJcI4dMfRXwyMi|;t2
z(v!>H+-yuP6JwY%mCmc!?m6(_&#r{R5(731shMdVLVS;n`^^M%XFeCLR4URjYCYR_
zOS`qgHgPIjn5DaQpzm~Bkt0%epQnUfv-GI%`ueSTf?(Fgmb5Qn@}-^{K7S`vs;+oF
z;SBHcua3c0>nHi;1#0jf@SA;eR*WoTzQnR#-ftfp9=o(eZg(+%Ua0A|JF6q~&gCXG
z)5X`dI9NAra$-IEa&n%wzQ_@)vc(2Yyiyl|a%(5)aZ9o~EuIw|_*v?Dr;5O>d+JM*
zX7BJ9_kNO*Hb-$^;WYOt8(mC-Q)gVf@+xgN*Q1>|5BS0()E4!o#$9q$&yF~dn33ER
zU1+k|cw$S~mqOvw{zXqBmrwdDJu!XSJS!H-)}>zR%_2V>TQ{UVaWZ?E%9#CXZiK0b
z<*%K7+}a_A5;BaHY!&n5DoWdIt)Csd=w~0hB`9&SOu=+Rrd6fEKY9-(2t48tw>+x2
z@6(JVncC}me;nCaOg6QxZms@ds%#h{?7B|uMJZ#NbM`i)-}$e_89o~%l{y$O15=)A
ziEBhjN@7W>RdP`(kYX@0Ff`OPu+TL&3^6pcGB&X?wA3{)w=yt@*6aC)q9HdwB{QuO
zw+5|Z6DObsNstY}`DrEPiAAXljw$&`sS2LCiRr09sfj6-g(p*OfQlGAUHx3vIVCg!
E0GpUlfdBvi

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_lock_holo_dark.png b/res/drawable-mdpi/ic_menu_lock_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..37caa642232bff9264f6038315de0d839bc6f574
GIT binary patch
literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RX2NM(y2-4I1g#Z8n@JU2LR7l6w
zmCb4tK@^3*Gt)C9A&5VTK}^!)2yVr7$VP}8e<1h}f*aq$7Z7{}6;wnK+(s}UF0v0e
zsa6*vE+h(>kfx7|PDp2FYNnT3n{IAZojUi_xwqgS9of;h6<XzAh^*A;?J423?sL;;
z!9N<Wc%1HMr1bzYQo<cQ@eBZ#z`wZF`4H&TV-T+ClbgcuTk@<h{Nd_!Z((R{V`O3*
zZVJEGs+Wpot$7PHt9J`E1$+>k6=A!V97T3cg|DH=ymOby48G$PuzatZAH^>1`XK_X
z)d1)x%mK7EPDu3}fVnT42p}l|$bBN(2SYm_0!V6_WB(An&MkNZN>YG89tTjGH9epY
zkQUWt7fV6+x<%FKL+6B5o{@82ZA;&9g;c|fz#cy-w4QE7G|&_m4A`<42lBOGnkDCM
zM>ViP2nh*X>S3^vO13hN0;oD?z<TPJ;8E(0O2Ji0WLW8JLb$Eh$1?*2BE?h^_}JM5
z=)7TDQI|vk1oMZ*HRbtu>BSjX-RwnZXEVIzj2&}n5@jIlbzNba>t$Cu;nT?sFyerm
z+(`D2)hAw~Kv0xhj~QqniTE`FPW(vC@%<|qEaNJO8oE*1uqJ?8qk6$W6KK(j^o|}~
sK5KW}ahP)~yZSy<7&L*)=D!<%0gEcIQ;LfM9smFU07*qoM6N<$f}vajOaK4?

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_lock_unverified_holo_dark.png b/res/drawable-mdpi/ic_menu_lock_unverified_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..67d97fb76187eccaf22ec7d55d47a6fab0a2b4ac
GIT binary patch
literal 1490
zcmV;@1ugoCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RX2NM)1DP3f5{{R35WJyFpR9M69
zS6gpXRTTcdGiOFROj~C<Kua%k+JVMkRBk0ktVYF4tQt-H1L}i`Fa8UkebNUXh%bQg
z5``cHquj!vm>_5?B9xvfogOS5hRmhsGUx2&LubrbdZ)g*UryFOd++tFZ+&ZDfdAWl
zv}`sTHcc~pKWlKM6HL>5kmP#+hD0O*03tG_Y1-ESK1!uh?tccrG|ksY9u$#iL${D*
z4ai*puNa1LZp{Ihrn!UU&ms~c2@wH+5=n|ktf8+A;4#B6ZY*bAZ3P6JZg75v<e-Rj
zE2Vl!J})A_007At$>VFvKsK9wUqn8f4OXrzrMC6;_4$os#>U24NR9yLBuS;zo4vig
zU#<xQBC@ykrHH&c*Es<6_VyM<<b!%pB%fcC6qu%|14!2Ga5#K=K|0AV8qDPQ_&Dzy
z0B4(Cw|(E2MaDWcrT`$~`~H#u^ks{M%aV&b2RqhE1IrSwuIs7+Ea%Ky9e`9SRR!QQ
z*lMA%ot>SH;<Wqv`qZk+&@|0K0G|Qy0c<205fPG{05D%@0zeayt~vk!(*P97H&Ut8
zFDudj$#noa>NLu%cM*}UC2}jZ|4jh8MZ_18$l0MG4L}$`sK$H%z}FYayO3-Y9~<&3
z^&Ho?;2Jp2RbH)M07OKjMbosV5UKe}RYhb*TTJx}h)5bDJtQJu)rCq@76~Z9P^fdJ
zRO&xvn!9z+>m|8qF$NYYy}G*h8itXn>E%_Dhv%E4To<L2C%0<49-W$=-uy?g_-xzy
z^^YDNA3w3LyZiLA_klSj`BU9F02qdGB%96tNwWW+F+l+3x(Esd`nPUvE))u}u|i?r
zGkf;DAmwsP8<{+n%Q@Og0n{SgP`A&#{IWK3;6Sqqf(@c-Ri_lh_aTl0<+{jEOvHY_
zdw1Ux0|PIqa=9h2ZN!_KH!G3e)i59=`^+0RzRG|4={ry=x^COHgUYt!425PdCrTlx
zRG^AQRBqnn)#2g6r*`ZZP~~z=xh{Oybu*TgNylR6^i?oG2?9~B`+CGMJ{H?f1jXVY
zHBA_akf9J%wF*@#p_0qtN+!cy{r!)tN~KA;E?m!Zf3&P~J+as~Ta(G_D`y}GM3u`_
zo>vXV$J@rU*>o|NLyuu_V|%+m*9qT8(Xw#k{CT89AuTACnv~<fa~$`_TemXl*486E
ziNuHxSo%_Bcuyse6r~`xjj=0NQj@vdivzZe-$qA)UAve_CQ&XFFnaki(z=e|&K)Sn
zf$h5XdCNMprM2}~Pa-iKh)j^2UU3;x(?AkVxvbyO_4jwDQk%ST8EMzWpP3BWQYlm?
zC$Xia1=Z<kNVN*baols3b^4J+;&@kgx962gIg+;lRP?2e-vwBJ9u9L|Pfv$+@gmwZ
z4Ixd#LzN25YuB)~y?xfX=V3-ET%4J?@NhhSq@%5ERBLJ~KXvHPA4{GEA`+hO9w15q
zBG98zY~Q&PBc6x+@Gz305F{Li5e}nz`!>Y)Q3(P}barC5VPv8c6T=D^*|UFtep!c+
zVHn3oM@O|{vG^|#{^y_T{^VrB%jd%o=}J1zmhW%gd}ez*KC~$w-vrMCNR({5n6a$y
z25kG=Xmj(`Kx9JGw8DyRMCo*TzP-JA;jOoB!}lKmpoJq5KG)TS^Oh9=cy)6k(LP-&
z6)sFo9Us`Z@kFw@`Dy@6lFUDO`0zdVgV1W;bDvzgByack2P6X#2{c`=b~ZH?&i?gR
zNjxw5YoYMN(;Xeh9*o7VD-nz29RT+JYuDty--eCt?9fmMKvYCpHFCp@>n5+~^NH@(
s)<S&!`Y8oW6Sxb&9z1$9m~V~00SZRszGmaUZU6uP07*qoM6N<$f*FUlasU7T

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_lock_verified_holo_dark.png b/res/drawable-mdpi/ic_menu_lock_verified_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ae03d01fd6dd36700384f64a1b4ecca6a2c2a31
GIT binary patch
literal 1619
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
R<+lI;002ovPDHLkV1gF85fuOc

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_attach.png b/res/drawable-xhdpi/ic_menu_attach.png
new file mode 100644
index 0000000000000000000000000000000000000000..f68aa5165964442c20fc6a2372c0dbe33ec5b03b
GIT binary patch
literal 2252
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
Nz}mvWyb0r*`d=Wa3331c

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_call.png b/res/drawable-xhdpi/ic_menu_call.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca89446153e3483724cbe090862af459cc4122c6
GIT binary patch
literal 1605
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
Dfy?#+

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_lock_holo_dark.png b/res/drawable-xhdpi/ic_menu_lock_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d3b0bfcd9c2b77951d629a912f84d9672bc810f
GIT binary patch
literal 1477
zcmV;$1v>hPP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ00001b5ch_0Itp)
z=>Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RX2NM)33%W8)nE(I<S4l)cRA}Dq
znB9vTWf;YOXEMpAyY24QV$p6jX|;ZWilW^WK?SWMiXeC;qIbO!Mf~^^6h!bwy|euX
z1ie!c1jP$0g4I&LuqMG;u-0weZky~Tnd8MwvgvkbHi;=J^u5?+Chxp+-t(O2JkL9D
zas2;Ab%<ZmNAPcNM}thRQR=y>guyst;JVJ1qFx@#7Y0D*_0=hDW5$<iizg`vH@u(|
z9M^9gE1fwX=tuxmfih4naJgoE7q@f0CY}6hbb`Y=;Lm(Or^+p;L7yN70#MuFS)SD$
z-a<fl&a)9MwS3&4>$UK^?d|>ng#DBMQ|Jfv5;rp0i{J4s0tyr;v&qw~*ZH*6w-)*W
z5bve1hrP^!kr5aoB0<hl5(#bLVNTW>r33vYSlHkGYhs3H{D8p%XtTsTr>I*@Xqsup
z2rx)I>2~#Sw0LD-9E5#}b(~k&4Hy&9@)5nqw;c5X0n?PYmB-kIh>XNNyqtTL`p86B
z8}l6dDaSMeAL|W%WS;tRQ-lSLdn-5bJhQf}z~&pCD1SGC5F~28ocp|0C?WuV;<w8m
z^h|2dV4fc;(<<r~WJ})3T;=y2e|FM$Xe%zo0^G)(%7Fvp7H{o%zXPtf288?c4mf5t
z<Zfo5ysirRlBzG|GIC(3vyboBo^?gb2l<R;0P<X|=@Av9+8CEGO#p%=KJrnhQtdIC
zGBs*|tNthfAf}lbQ5t%T35rGtFLPwa>GR_ngV8((X(j-QO#BwiM59Q<fRLO7#!W3}
zq|_3pFtIy^<eNF75rhDtPP)pOT*W>SPYj%E2P4sdkU9wDEaS-A?HGX}AP6-Q03-$|
z)ZO6PV`D_C$KS+g061C8>#jKk?cSKR|An3~o1)>eK#B7DqE$(0{%0Xr)n1?GY<FJ~
z3z_RJC`mk<Gds`rR+U=+43wz=OsIfyR8*0q<3Mbx6)C3B-}Gd6X5jJal!zp2nR;ok
za$JD|FX(<6n2_yULryZ(`BICi)Y_BmrT{ie{G?+<&gqOkWM8R0kOl++H*ha!0TGf*
z(xJ%iOm_<$D(;#JT*oe~fCYYTYd{eS#0Kzq_u7u{7M-arIceGg3JEQd#~2iV0b1P%
z*+MHaNN&3m?{1Uo*fLjs0HEnsx`n6sK$B?Db6cjFM}zu6?p$Qjx$AWb4vH^@mHh9S
zt&WQhVMMuJj#p<*TyUi&{ozvtT*4Oeb{EkooX{CLY9yJ4ztR`{>`>Qh);Ez~%Y@Zk
zYd`?a)j?Q2mf6ofe?tg}Irj1>g|v4$W35aE)^Zw<+~hFt>R_oAH(=ERn&LKgIxZU;
z<oFS!-BwCrk_?Od;6tTW+?+yrk*}#xS4sg=Mi^2U$ft=g9!ol@CcTG_WlqrWhP0hV
zBkl+C(MIQ2ZDgwBe1mBq!-&?}zikUP>t=6VDY8ccU*&5(A#8iF5DdtGB-skIOHWsC
zt%W5@)W+NQ@D$s@md^F8m0og$8W7kMyvQVPatN5?IXwc7(j?;%d>>fNs1c8IoI}79
zJmSQk2LA>ypaxc&PQw^u0LkC3MpmC`Jd6=VX-=R{WCZo(8%U#b!(N+%tP&9p@!_OX
zb2`T)b<YgSI$I1O!cl!@RmKq|lYunqx@AA=)`!ef)ezONO_2Gh02jEi@(^OjdK`He
z0DX8=(R(xtY*rsTy$~7*w26(GIW|0i-cDxinvk@9>NL&6Qjnnm71JBDRb6WKt0z*9
za@j3e-nn@iUR=McTQ^Xr`D=(&uAmt<JNoBm14TaB`u*xb9;t94Mz#N96z~gQjQI7x
fa&cT7|IzU`I!*rNRDu&U00000NkvXXu0mjf5YeuT

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_lock_unverified_holo_dark.png b/res/drawable-xhdpi/ic_menu_lock_unverified_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..694bf475a8fed0d102a0507b5f5109778e961509
GIT binary patch
literal 4131
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

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_lock_verified_holo_dark.png b/res/drawable-xhdpi/ic_menu_lock_verified_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..12e935e8e45ed973aecd11eaea1e1df9c1b8077a
GIT binary patch
literal 4607
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

literal 0
HcmV?d00001

diff --git a/res/layout/compose_message_activity.xml b/res/layout/compose_message_activity.xml
deleted file mode 100644
index b7a384a64b..0000000000
--- a/res/layout/compose_message_activity.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 Esmertec AG.
- * 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:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-		<RelativeLayout android:layout_width="fill_parent"
-						android:layout_height="43dip"
-						android:background="@drawable/iphone_bar_top">
-												
-			<ImageView
-				android:id="@+id/secure_indicator"
-				android:visibility="gone"
-				android:paddingLeft="5.0dip" 
-				android:paddingRight="2.0dip" 
-				android:layout_width="wrap_content" 
-				android:layout_height="wrap_content" 
-				android:src="@drawable/ic_lock_iphone" 
-				android:adjustViewBounds="false" 
-				android:layout_alignParentLeft="true" 
-				android:layout_centerVertical="true" />
-
-<!--			<ImageView-->
-<!--				android:id="@+id/secure_indicator_yellow"-->
-<!--				android:visibility="gone"-->
-<!--				android:paddingLeft="5.0dip" -->
-<!--				android:paddingRight="2.0dip" -->
-<!--				android:layout_width="wrap_content" -->
-<!--				android:layout_height="wrap_content" -->
-<!--				android:src="@drawable/ic_lock_iphone_yellow2" -->
-<!--				android:adjustViewBounds="false" -->
-<!--				android:layout_alignParentLeft="true" -->
-<!--				android:layout_centerVertical="true" />-->
-
-			<ImageView
-				android:id="@+id/secure_indicator_red"
-				android:visibility="gone"
-				android:paddingLeft="5.0dip" 
-				android:paddingRight="2.0dip" 
-				android:layout_width="wrap_content" 
-				android:layout_height="wrap_content" 
-				android:src="@drawable/ic_lock_iphone_red2" 
-				android:adjustViewBounds="false" 
-				android:layout_alignParentLeft="true" 
-				android:layout_centerVertical="true" />
-				
-<!--			<ImageView-->
-<!--				android:id="@+id/secure_indicator_green"-->
-<!--				android:visibility="gone"-->
-<!--				android:paddingLeft="5.0dip" -->
-<!--				android:paddingRight="2.0dip" -->
-<!--				android:layout_width="wrap_content" -->
-<!--				android:layout_height="wrap_content" -->
-<!--				android:src="@drawable/ic_lock_iphone_red2" -->
-<!--				android:adjustViewBounds="false" -->
-<!--				android:layout_alignParentLeft="true" -->
-<!--				android:layout_centerVertical="true" />-->
-			
-<!--			<ImageView-->
-<!--				android:id="@+id/secure_indicator_question"-->
-<!--				android:visibility="gone"-->
-<!--				android:paddingLeft="0.0dip"-->
-<!--				android:paddingRight="2.0dip"-->
-<!--				android:layout_width="wrap_content"-->
-<!--				android:layout_height="wrap_content"-->
-<!--				android:src="@drawable/ic_lock_iphone_question"-->
-<!--				android:adjustViewBounds="false"-->
-<!--				android:layout_toRightOf="@id/secure_indicator_green"-->
-<!--				android:layout_centerVertical="true" />-->
-			
-			
-			<TextView
-				android:id="@+id/title_bar"
-			    android:textSize="18.0dip" 
-			    android:textStyle="bold" 
-			    android:textColor="#ffffffff" 
-			    android:singleLine="true" 
-			    style="?android:windowTitleStyle"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerHorizontal="true"
-				android:layout_centerVertical="true"
-				android:gravity="center" />
-				
-<!--			<ImageView-->
-<!--				android:id="@+id/settings_button"-->
-<!--				android:paddingLeft="2.0dip" -->
-<!--				android:paddingRight="5.0dip" -->
-<!--				android:layout_width="wrap_content" -->
-<!--				android:layout_height="wrap_content" -->
-<!--				android:src="@drawable/ic_settings_iphone" -->
-<!--				android:adjustViewBounds="false" -->
-<!--				android:layout_alignParentRight="true" -->
-<!--				android:layout_centerVertical="true" />-->
-
-		</RelativeLayout>
-		
-<org.thoughtcrime.securesms.components.RecipientsPanel
-	android:id="@+id/recipients"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:visibility="gone"
-	/>
-
-    <LinearLayout
-    	android:id="@+id/layout_container"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:background="@drawable/white_background"
-        android:gravity="bottom">
-
-        <ListView
-            android:id="@+id/conversation"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_weight="1.0"
-            android:listSelector="@drawable/chat_history_selector"
-            android:drawSelectorOnTop="true"
-            android:transcriptMode="alwaysScroll"
-            android:scrollbarAlwaysDrawVerticalTrack="true"
-            android:scrollbarStyle="insideInset"
-            android:stackFromBottom="true"
-            android:visibility="gone"
-            android:fadingEdge="none"
-            android:layout_marginBottom="1dip"
-            android:cacheColorHint="@android:color/white"
-        android:dividerHeight="0px" android:divider="#ffffffff"/>
-    
-        <ScrollView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:orientation="vertical"
-                android:paddingBottom="5dip"
-                android:background="@drawable/bottombar_landscape_565">
-  
-               <LinearLayout
-                 android:id="@+id/attachment_editor"
-                 android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:orientation="horizontal"
-                 android:visibility="gone">
-
-				<ImageView
-			        android:id="@+id/attachment_thumbnail"
-			        android:layout_width="fill_parent"
-			        android:layout_height="150dip"
-			        android:layout_weight="1" />
-					
-			    <LinearLayout
-			        android:orientation="vertical"
-			        android:layout_width="wrap_content"
-			        android:layout_height="fill_parent"
-			        android:gravity="center_vertical">
-			
-<!--			        <Button-->
-<!--			            android:id="@+id/view_image_button"-->
-<!--			            style="?android:attr/buttonStyleSmall"-->
-<!--			            android:layout_width="100dip"-->
-<!--			            android:layout_height="50dip"-->
-<!--			            android:text="View" />-->
-<!--			-->
-<!--			        <Button-->
-<!--			            android:id="@+id/replace_image_button"-->
-<!--			            style="?android:attr/buttonStyleSmall"-->
-<!--			            android:layout_width="100dip"-->
-<!--			            android:layout_height="50dip"-->
-<!--			            android:text="Replace" />-->
-			
-			        <Button
-			            android:id="@+id/remove_image_button"
-			            style="?android:attr/buttonStyleSmall"
-			            android:layout_width="100dip"
-			            android:layout_height="50dip"
-			            android:text="Remove" />
-			
-			    </LinearLayout>
-
-           </LinearLayout>
-  
-  
-  
-                <LinearLayout
-                    android:id="@+id/bottom_panel"
-                    android:orientation="horizontal"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="5dip"
-                    android:paddingLeft="5dip"
-                    android:paddingRight="5dip"
-                    >
-
-                    <RelativeLayout
-                        android:id="@+id/editor_with_counter"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:addStatesFromChildren="true"
-                        android:background="@android:drawable/edit_text">
-
-                        <EditText
-                            android:id="@+id/embedded_text_editor"
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:autoText="true"
-                            android:capitalize="sentences"
-                            android:nextFocusRight="@+id/send_button"
-                            android:hint="Type to compose"
-                            android:maxLines="4"
-                            android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
-                            android:imeOptions="actionSend|flagNoEnterAction"
-                            android:background="@null"
-                            android:maxLength="1000"
-                        />
-    
-                        <TextView
-                            android:id="@+id/text_counter"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="#88000000"
-                            android:textColor="#ffffffff"
-                            android:textSize="11sp"
-                            android:textStyle="bold"
-                            android:paddingLeft="3dip"
-                            android:paddingRight="3dip"
-                            android:layout_alignParentRight="true"
-                            android:layout_alignParentTop="true"
-                            android:visibility="gone"
-                        />
-                    </RelativeLayout>
-
-                    <Button android:id="@+id/send_button"
-                        android:layout_marginLeft="5dip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="fill_parent"
-                        style="?android:attr/buttonStyle"
-                        android:layout_gravity="center_vertical"
-                        android:nextFocusLeft="@+id/embedded_text_editor"
-                        android:text="Send"
-                    />
-                </LinearLayout>
-                       <TextView android:id="@+id/space_left"
-                       			 android:paddingLeft="5dip"
-         		   				 android:layout_width="fill_parent"
-         		   				 android:layout_height="wrap_content"
-         		   				 android:text="160/160 (1)"
-         		   		/>
-            </LinearLayout>
-        </ScrollView>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
new file mode 100644
index 0000000000..4d225e0aed
--- /dev/null
+++ b/res/layout/conversation_activity.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2008 Esmertec AG.
+ * 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:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+<org.thoughtcrime.securesms.components.RecipientsPanel
+    android:id="@+id/recipients"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    />
+
+    <RelativeLayout
+        android:id="@+id/layout_container"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:background="@drawable/white_background"
+        android:gravity="bottom">
+
+        <fragment
+            android:id="@+id/fragment_content"
+            android:name="org.thoughtcrime.securesms.ConversationFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_container" />
+
+<!--         <ListView -->
+<!--             android:id="@+id/conversation" -->
+<!--             android:layout_width="fill_parent" -->
+<!--             android:layout_height="fill_parent" -->
+<!--             android:layout_weight="1.0" -->
+<!--             android:listSelector="@drawable/chat_history_selector" -->
+<!--             android:drawSelectorOnTop="true" -->
+<!--             android:transcriptMode="alwaysScroll" -->
+<!--             android:scrollbarAlwaysDrawVerticalTrack="true" -->
+<!--             android:scrollbarStyle="insideInset" -->
+<!--             android:stackFromBottom="true" -->
+<!--             android:visibility="gone" -->
+<!--             android:fadingEdge="none" -->
+<!--             android:layout_marginBottom="1dip" -->
+<!--             android:cacheColorHint="@android:color/white" -->
+<!--         android:dividerHeight="0px" android:divider="#ffffffff"/> -->
+
+        <ScrollView android:id="@id/bottom_container"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true">
+
+            <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical"
+                android:paddingBottom="5dip"
+                android:background="#fff">
+
+               <LinearLayout
+                 android:id="@+id/attachment_editor"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="horizontal"
+                 android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/attachment_thumbnail"
+                    android:layout_width="fill_parent"
+                    android:layout_height="150dip"
+                    android:layout_weight="1" />
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:gravity="center_vertical">
+
+<!--			        <Button-->
+<!--			            android:id="@+id/view_image_button"-->
+<!--			            style="?android:attr/buttonStyleSmall"-->
+<!--			            android:layout_width="100dip"-->
+<!--			            android:layout_height="50dip"-->
+<!--			            android:text="View" />-->
+<!--			-->
+<!--			        <Button-->
+<!--			            android:id="@+id/replace_image_button"-->
+<!--			            style="?android:attr/buttonStyleSmall"-->
+<!--			            android:layout_width="100dip"-->
+<!--			            android:layout_height="50dip"-->
+<!--			            android:text="Replace" />-->
+
+                    <Button
+                        android:id="@+id/remove_image_button"
+                        style="?android:attr/buttonStyleSmall"
+                        android:layout_width="100dip"
+                        android:layout_height="50dip"
+                        android:text="Remove" />
+
+                </LinearLayout>
+
+           </LinearLayout>
+
+            <View android:background="#eeeeee"
+                android:layout_width="match_parent"
+                android:layout_height="1dp" />
+
+
+                <LinearLayout
+                    android:id="@+id/bottom_panel"
+                    android:orientation="horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="5dip"
+                    android:paddingLeft="5dip"
+                    android:paddingRight="5dip"
+                    >
+
+                    <EditText
+                            android:id="@+id/embedded_text_editor"
+                            android:textColor="@android:color/black"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1.0"
+                            android:autoText="true"
+                            android:capitalize="sentences"
+                            android:nextFocusRight="@+id/send_button"
+                            android:hint="Type message"
+                            android:maxLines="4"
+                            android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
+                            android:imeOptions="actionSend|flagNoEnterAction"
+                            android:maxLength="1000"
+                        />
+
+<!--                     <RelativeLayout -->
+<!--                         android:id="@+id/editor_with_counter" -->
+<!--                         android:layout_width="0dip" -->
+<!--                         android:layout_height="wrap_content" -->
+<!--                         android:layout_weight="1.0" -->
+<!--                         android:addStatesFromChildren="true" -->
+<!--                         android:background="@android:drawable/edit_text"> -->
+
+<!--                         <EditText -->
+<!--                             android:id="@+id/embedded_text_editor" -->
+<!--                             android:layout_width="fill_parent" -->
+<!--                             android:layout_height="wrap_content" -->
+<!--                             android:autoText="true" -->
+<!--                             android:capitalize="sentences" -->
+<!--                             android:nextFocusRight="@+id/send_button" -->
+<!--                             android:hint="Type to compose" -->
+<!--                             android:maxLines="4" -->
+<!--                             android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine" -->
+<!--                             android:imeOptions="actionSend|flagNoEnterAction" -->
+<!--                             android:background="@null" -->
+<!--                             android:maxLength="1000" -->
+<!--                         /> -->
+
+<!--                         <TextView -->
+<!--                             android:id="@+id/text_counter" -->
+<!--                             android:layout_width="wrap_content" -->
+<!--                             android:layout_height="wrap_content" -->
+<!--                             android:background="#88000000" -->
+<!--                             android:textColor="#ffffffff" -->
+<!--                             android:textSize="11sp" -->
+<!--                             android:textStyle="bold" -->
+<!--                             android:paddingLeft="3dip" -->
+<!--                             android:paddingRight="3dip" -->
+<!--                             android:layout_alignParentRight="true" -->
+<!--                             android:layout_alignParentTop="true" -->
+<!--                             android:visibility="gone" -->
+<!--                         /> -->
+<!--                     </RelativeLayout> -->
+
+                    <Button android:id="@+id/send_button"
+                        android:layout_marginLeft="5dip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        style="?android:attr/buttonStyle"
+                        android:layout_gravity="center_vertical"
+                        android:nextFocusLeft="@+id/embedded_text_editor"
+                        android:text="Send"
+                    />
+                </LinearLayout>
+                       <TextView android:id="@+id/space_left"
+                                    android:paddingLeft="5dip"
+                                     android:layout_width="fill_parent"
+                                     android:layout_height="wrap_content"
+                                     android:text="160/160 (1)"
+                            />
+            </LinearLayout>
+        </ScrollView>
+    </RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
new file mode 100644
index 0000000000..ef5379fd4a
--- /dev/null
+++ b/res/layout/conversation_fragment.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <ListView android:id="@android:id/list"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_weight="1.0"
+              android:listSelector="@drawable/chat_history_selector"
+              android:drawSelectorOnTop="true"
+              android:transcriptMode="alwaysScroll"
+              android:scrollbarAlwaysDrawVerticalTrack="true"
+              android:scrollbarStyle="insideInset"
+              android:stackFromBottom="true"
+              android:fadingEdge="none"
+              android:layout_marginBottom="1dip"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml
new file mode 100644
index 0000000000..a206204bcf
--- /dev/null
+++ b/res/menu/conversation.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="Call"
+          android:id="@+id/menu_call"
+          android:icon="@drawable/ic_menu_call"
+          android:showAsAction="ifRoom" />
+
+    <item android:title="Add attachment"
+          android:id="@+id/menu_add_attachment"
+          android:icon="@drawable/ic_menu_attach" />
+
+    <item android:title="Delete thread"
+          android:id="@+id/menu_delete_thread"
+          android:icon="@android:drawable/ic_menu_delete" />
+
+</menu>
diff --git a/res/menu/conversation_button_context.xml b/res/menu/conversation_button_context.xml
new file mode 100644
index 0000000000..20750c5fcb
--- /dev/null
+++ b/res/menu/conversation_button_context.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="Send unencrypted"
+          android:id="@+id/menu_context_send_unencrypted" />
+</menu>
diff --git a/res/menu/conversation_context.xml b/res/menu/conversation_context.xml
new file mode 100644
index 0000000000..f54c882e0c
--- /dev/null
+++ b/res/menu/conversation_context.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="Copy text"
+          android:id="@+id/menu_context_copy" />
+
+    <item android:title="Delete message"
+          android:id="@+id/menu_context_delete_message" />
+
+    <item android:title="Message details"
+          android:id="@+id/menu_context_details" />
+
+    <item android:title="Forward message"
+          android:id="@+id/menu_context_forward" />
+</menu>
diff --git a/res/menu/conversation_insecure.xml b/res/menu/conversation_insecure.xml
new file mode 100644
index 0000000000..d04f152202
--- /dev/null
+++ b/res/menu/conversation_insecure.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="Security"
+          android:id="@+id/menu_security"
+          android:icon="@drawable/ic_menu_lock_holo_dark"
+          android:showAsAction="ifRoom">
+          <menu>
+              <item android:title="Start Secure Session"
+                    android:id="@+id/menu_start_secure_session" />
+
+          </menu>
+    </item>
+</menu>
\ No newline at end of file
diff --git a/res/menu/conversation_secure_unverified.xml b/res/menu/conversation_secure_unverified.xml
new file mode 100644
index 0000000000..d231e10837
--- /dev/null
+++ b/res/menu/conversation_secure_unverified.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="Security"
+          android:id="@+id/menu_security"
+          android:icon="@drawable/ic_menu_lock_unverified_holo_dark"
+          android:showAsAction="ifRoom">
+          <menu>
+              <item android:title="Verify Session"
+                    android:id="@+id/menu_verify_session" />
+
+              <item android:title="Verify Recipient"
+                    android:id="@+id/menu_verify_recipient"/>
+
+              <item android:title="Abort Secure Session"
+                    android:id="@+id/menu_abort_session"/>
+
+          </menu>
+    </item>
+</menu>
\ No newline at end of file
diff --git a/res/menu/conversation_secure_verified.xml b/res/menu/conversation_secure_verified.xml
new file mode 100644
index 0000000000..d231e10837
--- /dev/null
+++ b/res/menu/conversation_secure_verified.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="Security"
+          android:id="@+id/menu_security"
+          android:icon="@drawable/ic_menu_lock_unverified_holo_dark"
+          android:showAsAction="ifRoom">
+          <menu>
+              <item android:title="Verify Session"
+                    android:id="@+id/menu_verify_session" />
+
+              <item android:title="Verify Recipient"
+                    android:id="@+id/menu_verify_recipient"/>
+
+              <item android:title="Abort Secure Session"
+                    android:id="@+id/menu_abort_session"/>
+
+          </menu>
+    </item>
+</menu>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/ComposeMessageActivity.java b/src/org/thoughtcrime/securesms/ComposeMessageActivity.java
deleted file mode 100644
index 15a049a82a..0000000000
--- a/src/org/thoughtcrime/securesms/ComposeMessageActivity.java
+++ /dev/null
@@ -1,830 +0,0 @@
-/** 
- * Copyright (C) 2011 Whisper Systems
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.thoughtcrime.securesms.components.RecipientsPanel;
-import org.thoughtcrime.securesms.crypto.AuthenticityCalculator;
-import org.thoughtcrime.securesms.crypto.DecryptingQueue;
-import org.thoughtcrime.securesms.crypto.KeyExchangeInitiator;
-import org.thoughtcrime.securesms.crypto.KeyExchangeProcessor;
-import org.thoughtcrime.securesms.crypto.KeyUtil;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.MessageRecord;
-import org.thoughtcrime.securesms.database.SessionRecord;
-import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.thoughtcrime.securesms.mms.AttachmentManager;
-import org.thoughtcrime.securesms.mms.AttachmentTypeSelectorAdapter;
-import org.thoughtcrime.securesms.mms.MediaTooLargeException;
-import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
-import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.service.MessageNotifier;
-import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.util.CharacterCalculator;
-import org.thoughtcrime.securesms.util.EncryptedCharacterCalculator;
-import org.thoughtcrime.securesms.util.InvalidMessageException;
-import org.thoughtcrime.securesms.util.MemoryCleaner;
-
-import ws.com.google.android.mms.MmsException;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.text.ClipboardManager;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
-import android.view.Window;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.CursorAdapter;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * Activity for displaying a message thread, as well as
- * composing/sending a new message into that thread.
- * 
- * @author Moxie Marlinspike
- *
- */
-public class ComposeMessageActivity extends Activity {
-		
-  private static final int PICK_CONTACT               = 1;
-  private static final int PICK_IMAGE                 = 2;
-  private static final int PICK_VIDEO                 = 3;
-  private static final int PICK_AUDIO                 = 4;
-	
-  private static final int MENU_OPTION_CALL           = 2;
-  //	private static final int MENU_OPTION_VIEW_CONTACT   = 3;
-  private static final int MENU_OPTION_VERIFY_KEYS    = 4;
-  private static final int MENU_OPTION_DELETE_THREAD  = 5;
-  private static final int MENU_OPTION_START_SESSION  = 6;
-  private static final int MENU_OPTION_DELETE_KEYS    = 7;
-  private static final int MENU_OPTION_ADD_ATTACHMENT = 8;
-  private static final int MENU_OPTION_DETAILS        = 9;
-  private static final int MENU_OPTION_VERIFY_IDENTITY = 10;
-  private static final int MENU_OPTION_REDECRYPT       = 11;
-	
-  private static final int MENU_OPTION_COPY           = 100;
-  private static final int MENU_OPTION_DELETE         = 101;
-  private static final int MENU_OPTION_FORWARD        = 102;
-  private static final int MENU_OPTION_SEND_CLEARTEXT = 103;
-  private static final int MENU_OPTION_SEND_DELAYED   = 104;
-
-  private static final int MESSAGE_ITEM_GROUP         = 0;
-  private static final int SEND_BUTTON_GROUP          = 1;
-	
-  private MasterSecret masterSecret;
-  private ConversationAdapter conversationAdapter;
-  private ListView conversationView;
-  private RecipientsPanel recipientsPanel;
-  private EditText composeText;
-  private ImageButton addContactButton;
-  private Button sendButton;
-  private TextView charactersLeft;
-  private TextView titleBar;
-	
-  private View greyLock;
-  private View redLock;
-	
-  private AttachmentTypeSelectorAdapter attachmentAdapter;
-  private AttachmentManager attachmentManager;
-  private KillActivityReceiver killActivityReceiver;
-  private SecurityUpdateReceiver securityUpdateReceiver;
-	
-  private Recipients recipients;
-  private long threadId;
-  private boolean sendEncrypted;
-  private CharacterCalculator characterCalculator = new CharacterCalculator();
-
-  @Override
-  protected void onCreate(Bundle state) {
-    super.onCreate(state);
-    Log.w("ComposeMessageActivity", "onCreate called...");
-    getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-    setContentView(R.layout.compose_message_activity);
-    
-    initializeReceivers();
-    initializeResources();
-    initializeTitleBar();
-    initializeColors();
-  }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    Log.w("ComposeMessageActivity", "onResume called...");
-    initializeSecurity(recipients);
-    initializeTitleBar();
-    calculateCharactersRemaining();
-  }
-    
-  @Override
-  protected void onStart() {
-    super.onStart();
-    Log.w("ComposeMessageActivity", "onStart called...");
-    if (isExistingConversation()) initializeConversationAdapter();
-    else                          initializeRecipientsInput();    
-    
-    registerPassphraseActivityStarted();
-  }
-
-  @Override
-  protected void onStop() {
-    super.onStop();
-    Log.w("ComposeMessageActivity", "onStop called...");
-    if (this.conversationAdapter != null)
-      this.conversationAdapter.close();
-    
-    registerPassphraseActivityStopped();
-  }
-  
-  @Override
-  protected void onDestroy() {
-    unregisterReceiver(killActivityReceiver);
-    unregisterReceiver(securityUpdateReceiver);
-    MemoryCleaner.clean(masterSecret);
-    super.onDestroy();
-  }
-  
-  @Override  
-  public void onActivityResult(int reqCode, int resultCode, Intent data) {  
-    Log.w("ComposeMessageActivity", "onActivityResult called: " + resultCode + " , " + data);
-    super.onActivityResult(reqCode, resultCode, data);  
-     
-    if (data == null || resultCode != Activity.RESULT_OK)
-      return;
-    
-    switch (reqCode) {  
-    case PICK_CONTACT:
-      Recipients recipients = (Recipients)data.getParcelableExtra("recipients");
-      
-      if (recipients != null)
-        recipientsPanel.addRecipients(recipients);
-      
-      break;
-    case PICK_IMAGE:
-      addAttachmentImage(data.getData());
-      break;
-    case PICK_VIDEO:
-      addAttachmentVideo(data.getData());
-      break;
-    case PICK_AUDIO:
-      addAttachmentAudio(data.getData());
-      break;
-    }  
-  }  
-   
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    super.onPrepareOptionsMenu(menu);
-    menu.clear();
-
-    if (recipients != null && recipients.isSingleRecipient())
-      menu.add(0, MENU_OPTION_CALL, Menu.NONE, "Call").setIcon(android.R.drawable.ic_menu_call);
-			
-    menu.add(0, MENU_OPTION_DELETE_THREAD, Menu.NONE, "Delete Thread").setIcon(android.R.drawable.ic_menu_delete);
-    menu.add(0, MENU_OPTION_ADD_ATTACHMENT, Menu.NONE, "Add Attachment").setIcon(R.drawable.ic_menu_attachment);
-		
-    if (recipients != null && recipients.isSingleRecipient() && SessionRecord.hasSession(this, recipients.getPrimaryRecipient())) {
-      SubMenu secureSettingsMenu = menu.addSubMenu("Secure Session Options").setIcon(android.R.drawable.ic_menu_more);
-      secureSettingsMenu.add(0, MENU_OPTION_VERIFY_KEYS, Menu.NONE, "Verify Secure Session").setIcon(R.drawable.ic_lock_message_sms);
-      secureSettingsMenu.add(0, MENU_OPTION_VERIFY_IDENTITY, Menu.NONE, "Verify Recipient Identity").setIcon(android.R.drawable.ic_menu_zoom);
-      secureSettingsMenu.add(0, MENU_OPTION_DELETE_KEYS, Menu.NONE, "Abort Secure Session").setIcon(android.R.drawable.ic_menu_revert);
-    } else if (recipients != null && recipients.isSingleRecipient()) {
-      menu.add(0, MENU_OPTION_START_SESSION, Menu.NONE, "Start Secure Session").setIcon(R.drawable.ic_lock_message_sms);
-    }
-
-    return true;
-  }
-	
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-		
-    switch (item.getItemId()) {
-    case MENU_OPTION_CALL:            dial(recipients.getPrimaryRecipient());  return true;
-    case MENU_OPTION_DELETE_THREAD:   deleteThread();                          return true;
-    case MENU_OPTION_VERIFY_KEYS:     verifyKeys();                            return true;
-    case MENU_OPTION_START_SESSION:   initiateSecureSession();                 return true;
-    case MENU_OPTION_DELETE_KEYS:     abortSecureSession();                    return true;
-    case MENU_OPTION_ADD_ATTACHMENT:  addAttachment();                         return true;
-    case MENU_OPTION_VERIFY_IDENTITY: verifyIdentity();                        return true;
-    }
-		
-    return false;
-  }
-	
-  @Override
-  public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
-    if (v == sendButton) createSendButtonContextMenu(menu);
-    else                 createMessageItemContextMenu(menu);
-  }
-
-  private void createSendButtonContextMenu(ContextMenu menu) {
-    if (sendEncrypted)	
-      menu.add(SEND_BUTTON_GROUP, MENU_OPTION_SEND_CLEARTEXT, Menu.NONE, "Send unencrypted");
-		
-  }
-	
-  private void createMessageItemContextMenu(ContextMenu menu) {
-    menu.add(MESSAGE_ITEM_GROUP, MENU_OPTION_COPY, Menu.NONE, "Copy text");
-    menu.add(MESSAGE_ITEM_GROUP, MENU_OPTION_DELETE, Menu.NONE, "Delete");
-    menu.add(MESSAGE_ITEM_GROUP, MENU_OPTION_DETAILS, Menu.NONE, "Message Details");
-    menu.add(MESSAGE_ITEM_GROUP, MENU_OPTION_FORWARD, Menu.NONE, "Forward message");
-
-    Cursor cursor                     = ((CursorAdapter)conversationAdapter).getCursor();
-    ConversationItem conversationItem = (ConversationItem)(conversationAdapter.newView(this, cursor, null));
-    MessageRecord messageRecord       = conversationItem.getMessageRecord();
-
-    if (messageRecord.isFailedDecryptType())
-      menu.add(MESSAGE_ITEM_GROUP, MENU_OPTION_REDECRYPT, Menu.NONE, "Attempt decrypt again");
-  }
-	
-  @Override
-  public boolean onContextItemSelected(MenuItem item) {
-    if      (item.getGroupId() == MESSAGE_ITEM_GROUP) return onMessageContextItemSelected(item);
-    else if (item.getGroupId() == SEND_BUTTON_GROUP)  return onSendContextItemSelected(item);
-		
-    return false;
-  }
-
-  private boolean onSendContextItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-    case MENU_OPTION_SEND_CLEARTEXT: sendMessage(false); return true;
-    }
-    return false;
-  }
-	
-  private boolean onMessageContextItemSelected(MenuItem item) {
-    Cursor cursor                     = ((CursorAdapter)conversationAdapter).getCursor();
-    ConversationItem conversationItem = (ConversationItem)(conversationAdapter.newView(this, cursor, null));
-    String address                    = cursor.getString(cursor.getColumnIndexOrThrow(SmsDatabase.ADDRESS));
-    String body                       = cursor.getString(cursor.getColumnIndexOrThrow(SmsDatabase.BODY));
-    MessageRecord messageRecord       = conversationItem.getMessageRecord();
-
-    switch(item.getItemId()) {
-    case MENU_OPTION_COPY:      copyMessageToClipboard(messageRecord);          return true;
-    case MENU_OPTION_DELETE:    deleteMessage(messageRecord);                   return true;
-    case MENU_OPTION_DETAILS:   displayMessageDetails(messageRecord);           return true;
-    case MENU_OPTION_REDECRYPT: redecryptMessage(messageRecord, address, body); return true;
-    case MENU_OPTION_FORWARD:   forwardMessage(messageRecord);                  return true;
-    }
-		
-    return false;
-  }
-	
-  private void verifyIdentity() {
-    Intent verifyIdentityIntent = new Intent(this, VerifyIdentityActivity.class);
-    verifyIdentityIntent.putExtra("recipient", recipients.getPrimaryRecipient());
-    verifyIdentityIntent.putExtra("master_secret", masterSecret);
-    startActivity(verifyIdentityIntent);		
-  }
-	
-  private void verifyKeys() {
-    Intent verifyKeysIntent = new Intent(this, VerifyKeysActivity.class);
-    verifyKeysIntent.putExtra("recipient", recipients.getPrimaryRecipient());
-    verifyKeysIntent.putExtra("master_secret", masterSecret);
-    startActivity(verifyKeysIntent);
-  }
-	
-  private void initiateSecureSession() {
-    Recipient recipient         = recipients.getPrimaryRecipient();
-    String recipientName        = (recipient.getName() == null ? recipient.getNumber() : recipient.getName());
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle("Initiate Secure Session?");
-    builder.setIcon(android.R.drawable.ic_dialog_info);
-    builder.setCancelable(true);
-    builder.setMessage("Initiate secure session with " + recipientName + "?");
-    builder.setPositiveButton(R.string.yes, new InitiateSecureSessionListener());
-    builder.setNegativeButton(R.string.no, null);
-    builder.show();
-  }
-	
-  private void abortSecureSession() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle("Abort Secure Session Confirmation");
-    builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setCancelable(true);
-    builder.setMessage("Are you sure that you want to abort this secure session?");
-    builder.setPositiveButton(R.string.yes, new AbortSessionListener());
-    builder.setNegativeButton(R.string.no, null);
-    builder.show();
-  }
-	
-  private void dial(Recipient recipient) {
-    if (recipient == null) {
-      // XXX toast?
-      return;
-    }
-	    
-    Intent dialIntent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + recipient.getNumber()));
-    startActivity(dialIntent);
-  }
-
-  private void displayMessageDetails(MessageRecord messageRecord) {
-    String sender    = messageRecord.getRecipients().getPrimaryRecipient().getNumber();
-    String transport = messageRecord.isMms() ? "mms" : "sms";
-    long date        = messageRecord.getDate();
-
-    SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE MMM d, yyyy 'at' hh:mm:ss a zzz");
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle("Message Details");
-    builder.setIcon(android.R.drawable.ic_dialog_info);
-    builder.setCancelable(false);
-    builder.setMessage("Sender: " + sender + "\nTransport: " + transport.toUpperCase() + "\nSent/Received: " + dateFormatter.format(new Date(date)));
-    builder.setPositiveButton("Ok", null);
-    builder.show();
-  }
-	
-  private void forwardMessage(MessageRecord messageRecord) {
-    Intent composeIntent = new Intent(this, ComposeMessageActivity.class);
-    composeIntent.putExtra("forwarded_message", messageRecord.getBody());
-    composeIntent.putExtra("master_secret", masterSecret);
-    startActivity(composeIntent);
-  }
-	
-  private void redecryptMessage(MessageRecord messageRecord, String address, String body) {
-    DatabaseFactory.getEncryptingSmsDatabase(this).markAsDecrypting(messageRecord.getId());
-    DecryptingQueue.scheduleDecryption(this, masterSecret, messageRecord.getId(), address, body);
-  }
-	
-  private void copyMessageToClipboard(MessageRecord messageRecord) {
-    String body = messageRecord.getBody();
-    if (body == null) return;
-
-    ClipboardManager clipboard = (ClipboardManager)getSystemService(CLIPBOARD_SERVICE);
-    clipboard.setText(body);
-  }
-	
-  private void deleteMessage(MessageRecord messageRecord) {
-    long messageId   = messageRecord.getId();
-    String transport = messageRecord.isMms() ? "mms" : "sms";
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle("Delete Message Confirmation");
-    builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setCancelable(true);
-    builder.setMessage("Are you sure that you want to permanently delete this message?");
-    builder.setPositiveButton(R.string.yes, new DeleteMessageListener(messageId, transport));
-    builder.setNegativeButton(R.string.no, null);
-    builder.show();		
-  }
-	
-  private void deleteThread() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle("Delete Thread Confirmation");
-    builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setCancelable(true);
-    builder.setMessage("Are you sure that you want to permanently delete this conversation?");
-    builder.setPositiveButton(R.string.yes, new DeleteThreadListener());
-    builder.setNegativeButton(R.string.no, null);
-    builder.show();
-  }
-	
-  private void addAttachment() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setIcon(R.drawable.ic_dialog_attach);
-    builder.setTitle("Add attachment");
-    builder.setAdapter(attachmentAdapter, new AttachmentTypeListener());		
-    builder.show();
-  }
-	
-  private void addAttachment(int type) {
-    Log.w("ComposeMessageActivity", "Selected: " + type);
-    switch (type) {
-    case AttachmentTypeSelectorAdapter.ADD_IMAGE:
-      AttachmentManager.selectImage(this, PICK_IMAGE); break;
-    case AttachmentTypeSelectorAdapter.ADD_VIDEO:        
-      AttachmentManager.selectVideo(this, PICK_VIDEO); break;
-    case AttachmentTypeSelectorAdapter.ADD_SOUND:
-      AttachmentManager.selectAudio(this, PICK_AUDIO); break;
-    }
-  }
-	
-  private void addAttachmentImage(Uri imageUri) {
-    try {
-      attachmentManager.setImage(imageUri);
-    } catch (IOException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, "Sorry, there was an error setting your attachment.", Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);
-    }
-  }
-	
-  private void addAttachmentVideo(Uri videoUri) {
-    try {
-      attachmentManager.setVideo(videoUri);			
-    } catch (IOException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, "Sorry, there was an error setting your attachment.", Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);
-    } catch (MediaTooLargeException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, "Sorry, the selected video exceeds message size restrictions.", Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);
-    }
-  }
-	
-  private void addAttachmentAudio(Uri audioUri) {
-    try {
-      attachmentManager.setAudio(audioUri);			
-    } catch (IOException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, "Sorry, there was an error setting your attachment.", Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);			
-    } catch (MediaTooLargeException e) {
-      attachmentManager.clear();
-      Toast.makeText(this, "Sorry, the selected audio exceeds message size restrictions.", Toast.LENGTH_LONG).show();
-      Log.w("ComposeMessageActivity", e);			
-    }
-  }
-			
-  private void initializeReceivers() {
-    killActivityReceiver   = new KillActivityReceiver();
-    securityUpdateReceiver = new SecurityUpdateReceiver();
-		
-    registerReceiver(killActivityReceiver, new IntentFilter(KeyCachingService.PASSPHRASE_EXPIRED_EVENT), KeyCachingService.KEY_PERMISSION, null);
-    registerReceiver(securityUpdateReceiver, new IntentFilter(KeyExchangeProcessor.SECURITY_UPDATE_EVENT), KeyCachingService.KEY_PERMISSION, null);
-  }
-	
-  private void registerPassphraseActivityStarted() {
-    Intent intent = new Intent(this, KeyCachingService.class);
-    intent.setAction(KeyCachingService.ACTIVITY_START_EVENT);
-    startService(intent);
-  }
-	
-  private void registerPassphraseActivityStopped() {
-    Intent intent = new Intent(this, KeyCachingService.class);
-    intent.setAction(KeyCachingService.ACTIVITY_STOP_EVENT);
-    startService(intent);
-  }
-		
-  private void initializeSecurity(Recipients recipients) {
-    if (recipients != null && recipients.isSingleRecipient() && KeyUtil.isSessionFor(this, recipients.getPrimaryRecipient())) {
-      sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_small, 0);
-      sendButton.setCompoundDrawablePadding(10);
-      this.sendEncrypted       = true;			
-      this.characterCalculator = new EncryptedCharacterCalculator();
-    } else {
-      sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
-      this.sendEncrypted       = false;
-      this.characterCalculator = new CharacterCalculator();
-    }		
-		
-    calculateCharactersRemaining();
-  }
-		
-  private void initializeResources() {
-    recipientsPanel     = (RecipientsPanel)findViewById(R.id.recipients);
-    conversationView    = (ListView)findViewById(R.id.conversation);
-    recipients          = getIntent().getParcelableExtra("recipients");
-    threadId            = getIntent().getLongExtra("thread_id", -1);
-    addContactButton    = (ImageButton)findViewById(R.id.contacts_button);
-    sendButton          = (Button)findViewById(R.id.send_button);
-    composeText         = (EditText)findViewById(R.id.embedded_text_editor);
-    masterSecret        = (MasterSecret)getIntent().getParcelableExtra("master_secret");
-    charactersLeft      = (TextView)findViewById(R.id.space_left);
-    titleBar            = (TextView)findViewById(R.id.title_bar);
-    greyLock            = findViewById(R.id.secure_indicator);
-    redLock             = findViewById(R.id.secure_indicator_red);
-		
-    attachmentAdapter   = new AttachmentTypeSelectorAdapter(this);
-    attachmentManager   = new AttachmentManager(this);
-					
-    AuthenticityCheckListener authenticityListener = new AuthenticityCheckListener();
-    SendButtonListener sendButtonListener = new SendButtonListener();
-		
-    recipientsPanel.setPanelChangeListener(new RecipientsPanelChangeListener());
-    sendButton.setOnClickListener(sendButtonListener);
-    addContactButton.setOnClickListener(new AddRecipientButtonListener());
-    composeText.setOnKeyListener(new ComposeKeyPressedListener());
-    composeText.addTextChangedListener(new OnTextChangedListener());
-    composeText.setOnEditorActionListener(sendButtonListener);
-    greyLock.setOnClickListener(authenticityListener);
-    redLock.setOnClickListener(authenticityListener);
-    this.registerForContextMenu(conversationView);
-    this.registerForContextMenu(sendButton);
-		
-    if (getIntent().getStringExtra("forwarded_message") != null)
-      composeText.setText("FWD: " + getIntent().getStringExtra("forwarded_message"));
-  }
-
-  private void initializeTitleBarSecurity() {
-    redLock.setVisibility(View.GONE);
-    greyLock.setVisibility(View.GONE);
-		
-    if (recipients != null && recipients.isSingleRecipient() && KeyUtil.isSessionFor(this, recipients.getPrimaryRecipient())) {			
-      Recipient recipient = recipients.getPrimaryRecipient();
-      AuthenticityCalculator.setAuthenticityStatus(this, recipient, masterSecret, greyLock, redLock, titleBar);
-    }
-  }
-	
-  private void initializeTitleBar() {
-    if (recipients != null && recipients.isSingleRecipient()) {
-      String name = recipients.getPrimaryRecipient().getName();
-			
-      if (name == null || name.trim().length() == 0)
-        name = recipients.getPrimaryRecipient().getNumber();
-			
-      titleBar.setText(name);
-    } else {
-      titleBar.setText("Compose Message");
-    }		
-
-    initializeTitleBarSecurity();
-  }
-	
-  private void initializeColors() {
-    if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(ApplicationPreferencesActivity.DARK_CONVERSATION_PREF, false)) {
-      ((LinearLayout)findViewById(R.id.layout_container)).setBackgroundDrawable(getResources().getDrawable(R.drawable.softgrey_background));
-    }
-  }
-	
-  private void calculateCharactersRemaining() {
-    int charactersSpent                               = composeText.getText().length();		
-    CharacterCalculator.CharacterState characterState = characterCalculator.calculateCharacters(charactersSpent);		
-    charactersLeft.setText(characterState.charactersRemaining + "/" + characterState.maxMessageSize + " (" + characterState.messagesSpent + ")");
-  }
-	
-  private void initializeRecipientsInput() {
-    recipientsPanel.setVisibility(View.VISIBLE);
-        
-    if (this.recipients != null) {
-      recipientsPanel.addRecipients(this.recipients);
-    }
-  }
-		
-  private void initializeConversationAdapter() {
-    Cursor cursor       = DatabaseFactory.getMmsSmsDatabase(this).getConversation(threadId);
-    conversationAdapter = new ConversationAdapter(recipients, threadId, this, cursor, masterSecret, new FailedIconClickHandler());
-    conversationView.setAdapter(conversationAdapter);
-    conversationView.setItemsCanFocus(true);
-    conversationView.setVisibility(View.VISIBLE);
-		
-    recipientsPanel.setVisibility(View.GONE);
-    composeText.requestFocus();
-  }
-	
-  private boolean isExistingConversation() {
-    return this.recipients != null && this.threadId != -1;
-  }
-		
-  private Recipients getRecipients() throws RecipientFormattingException {
-    if (isExistingConversation()) return this.recipients;
-    else						  return recipientsPanel.getRecipients();
-  }
-	
-  private String getMessage() throws InvalidMessageException {
-    SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
-    String rawText       = composeText.getText().toString();
-		
-    if (rawText.length() < 1 && !attachmentManager.isAttachmentPresent()) 
-      throw new InvalidMessageException("Message is empty!");
-		
-    if (!sendEncrypted && sp.getBoolean(ApplicationPreferencesActivity.WHITESPACE_PREF, true) && rawText.length() <= 145)
-      rawText = rawText + "             ";
-
-    return rawText;
-  }
-	
-  private void sendComplete(Recipients recipients, long threadId) {
-    attachmentManager.clear();
-    recipientsPanel.disable();
-    composeText.setText("");
-		
-    this.recipients = recipients;
-    this.threadId   = threadId;
-		
-    if (this.conversationAdapter == null) {
-      initializeConversationAdapter();
-      this.recipientsPanel.setVisibility(View.GONE);
-      initializeTitleBar();
-    }		
-  }
-	
-  private void sendMessage(boolean sendEncrypted) {
-    try {
-      Recipients recipients   = getRecipients();
-      String message          = getMessage();				
-      long allocatedThreadId;
-			
-      if (attachmentManager.isAttachmentPresent()) {
-        allocatedThreadId = MessageSender.sendMms(ComposeMessageActivity.this, masterSecret, recipients, 
-                                                  threadId, attachmentManager.getSlideDeck(), message, 
-                                                  sendEncrypted);
-      } else if (recipients.isEmailRecipient()) {
-        allocatedThreadId = MessageSender.sendMms(ComposeMessageActivity.this, masterSecret, recipients, 
-                                                  threadId, new SlideDeck(), message, sendEncrypted);
-      } else {
-        allocatedThreadId = MessageSender.send(ComposeMessageActivity.this, masterSecret, recipients, 
-                                               threadId, message, sendEncrypted);
-      }
-			
-      sendComplete(recipients, allocatedThreadId);
-      MessageNotifier.updateNotification(ComposeMessageActivity.this, false);
-    } catch (RecipientFormattingException ex) {
-      Toast.makeText(ComposeMessageActivity.this, "Recipient is not a valid SMS or email address!", Toast.LENGTH_LONG).show();
-      Log.w("compose", ex);
-    } catch (InvalidMessageException ex) {
-      Toast.makeText(ComposeMessageActivity.this, "Message is empty!", Toast.LENGTH_SHORT).show();
-      Log.w("compose", ex);
-    } catch (MmsException e) {
-      Log.w("ComposeMessageActivity", e);
-    }
-  }
-
-  // Listeners
-	
-  private class KillActivityReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      finish();
-    }
-  }
-	
-  private class SecurityUpdateReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      if (intent.getLongExtra("thread_id", -1) == -1)
-        return;
-			
-      if (intent.getLongExtra("thread_id", -1) == threadId) {
-        initializeSecurity(recipients);
-        initializeTitleBar();
-        calculateCharactersRemaining();
-      }
-    }
-  }
-	
-  private class InitiateSecureSessionListener implements DialogInterface.OnClickListener {
-    public void onClick(DialogInterface dialogInterface, int which) {
-      KeyExchangeInitiator.initiate(ComposeMessageActivity.this, masterSecret, recipients.getPrimaryRecipient(), true);
-    }		
-  }
-	
-  private class FailedIconClickHandler extends Handler {
-    @Override
-    public void handleMessage(android.os.Message message) {
-      String failedMessageText = (String)message.obj;
-      ComposeMessageActivity.this.composeText.setText(failedMessageText);
-    }
-  }
-	
-  private class OnTextChangedListener implements TextWatcher {
-    public void afterTextChanged(Editable s) {
-      calculateCharactersRemaining();
-    }
-    public void beforeTextChanged(CharSequence s, int start, int count,int after) {}
-    public void onTextChanged(CharSequence s, int start, int before,int count) {}
-		
-  }
-	
-  private class ComposeKeyPressedListener implements OnKeyListener {
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-      if (event.getAction() == KeyEvent.ACTION_DOWN) {
-        if (keyCode == KeyEvent.KEYCODE_ENTER) {
-          if (PreferenceManager.getDefaultSharedPreferences(ComposeMessageActivity.this).getBoolean("pref_enter_sends", false)) {
-            sendButton.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
-            sendButton.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER));					
-            return true;
-          }
-        }
-      }
-      
-      return false;
-    }
-  }
-	
-  private class AuthenticityCheckListener implements OnClickListener {
-    public void onClick(View clicked) {
-      String message = null;
-			
-      if      (clicked == greyLock)   message = "This session is verified to be authentic.";
-      else if (clicked == redLock)    message = "Warning, this session has not yet been verified to be authentic.  You should verify your session or the identity key of the person you are communicating with.";
-			
-      AlertDialog.Builder builder = new AlertDialog.Builder(ComposeMessageActivity.this);
-      builder.setTitle("Authenticity");
-      builder.setIcon(android.R.drawable.ic_dialog_info);
-      builder.setCancelable(false);
-      builder.setMessage(message);
-      builder.setPositiveButton("Ok", null);
-      builder.show();
-    }		
-  }
-	
-  private class DeleteThreadListener implements DialogInterface.OnClickListener {
-    public void onClick(DialogInterface dialog, int which) {
-      if (threadId > 0) {
-        DatabaseFactory.getThreadDatabase(ComposeMessageActivity.this).deleteConversation(threadId);
-        finish();
-      }		
-    }		
-  };
-	
-  private class DeleteMessageListener implements DialogInterface.OnClickListener {
-    private final long messageId;
-    private final String transport;
-		
-    public DeleteMessageListener(long messageId, String transport) {
-      this.messageId = messageId;
-      this.transport = transport;
-    }
-		
-    public void onClick(DialogInterface dialog, int which) {
-      Log.w("ComposeMessageActivity", "Calling delete on: " + messageId);
-      if (transport.equals("mms"))
-        DatabaseFactory.getMmsDatabase(ComposeMessageActivity.this).delete(messageId);
-      else
-        DatabaseFactory.getSmsDatabase(ComposeMessageActivity.this).deleteMessage(messageId);
-    }
-  }
-	
-  private class AbortSessionListener implements DialogInterface.OnClickListener {
-    public void onClick(DialogInterface dialog, int which) {
-      if (recipients != null && recipients.isSingleRecipient()) {
-        KeyUtil.abortSessionFor(ComposeMessageActivity.this, recipients.getPrimaryRecipient());
-        initializeSecurity(recipients);
-        initializeTitleBar();
-      }
-    }
-  }
-	
-  private class AddRecipientButtonListener implements OnClickListener {
-    public void onClick(View v) {
-      Intent intent = new Intent(ComposeMessageActivity.this, ContactSelectionActivity.class);
-      startActivityForResult(intent, PICK_CONTACT);
-    }
-  };
-	
-  private class AttachmentTypeListener implements DialogInterface.OnClickListener {
-    public void onClick(DialogInterface dialog, int which) {
-      addAttachment(attachmentAdapter.buttonToCommand(which));
-    }
-  }
-	
-  private class RecipientsPanelChangeListener implements RecipientsPanel.RecipientsPanelChangedListener {
-    public void onRecipientsPanelUpdate(Recipients recipients) {
-      initializeSecurity(recipients);
-    }
-  }
-	
-  private class SendButtonListener implements OnClickListener, TextView.OnEditorActionListener {		
-    public void onClick(View v) {
-      sendMessage(sendEncrypted);
-    }
-
-    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-      if (actionId == EditorInfo.IME_ACTION_SEND) {
-        sendButton.performClick();
-        composeText.clearFocus();
-        return true;
-      }
-      return false;
-    }
-  };
-	
-}
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
new file mode 100644
index 0000000000..8c7c7aa852
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -0,0 +1,664 @@
+/**
+ * Copyright (C) 2011 Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.telephony.PhoneNumberUtils;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
+import org.thoughtcrime.securesms.components.RecipientsPanel;
+import org.thoughtcrime.securesms.crypto.AuthenticityCalculator;
+import org.thoughtcrime.securesms.crypto.KeyExchangeInitiator;
+import org.thoughtcrime.securesms.crypto.KeyExchangeProcessor;
+import org.thoughtcrime.securesms.crypto.KeyUtil;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.mms.AttachmentManager;
+import org.thoughtcrime.securesms.mms.AttachmentTypeSelectorAdapter;
+import org.thoughtcrime.securesms.mms.MediaTooLargeException;
+import org.thoughtcrime.securesms.mms.SlideDeck;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
+import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.service.MessageNotifier;
+import org.thoughtcrime.securesms.sms.MessageSender;
+import org.thoughtcrime.securesms.util.CharacterCalculator;
+import org.thoughtcrime.securesms.util.EncryptedCharacterCalculator;
+import org.thoughtcrime.securesms.util.InvalidMessageException;
+import org.thoughtcrime.securesms.util.MemoryCleaner;
+
+import ws.com.google.android.mms.MmsException;
+
+import java.io.IOException;
+
+/**
+ * Activity for displaying a message thread, as well as
+ * composing/sending a new message into that thread.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public class ConversationActivity extends SherlockFragmentActivity {
+
+  private static final int PICK_CONTACT               = 1;
+  private static final int PICK_IMAGE                 = 2;
+  private static final int PICK_VIDEO                 = 3;
+  private static final int PICK_AUDIO                 = 4;
+
+  private MasterSecret masterSecret;
+  private RecipientsPanel recipientsPanel;
+  private EditText composeText;
+  private ImageButton addContactButton;
+  private Button sendButton;
+  private TextView charactersLeft;
+
+  private AttachmentTypeSelectorAdapter attachmentAdapter;
+  private AttachmentManager attachmentManager;
+  private BroadcastReceiver killActivityReceiver;
+  private BroadcastReceiver securityUpdateReceiver;
+
+  private Recipients recipients;
+  private long threadId;
+  private boolean sendEncrypted;
+
+  private CharacterCalculator characterCalculator = new CharacterCalculator();
+
+  @Override
+  protected void onCreate(Bundle state) {
+    super.onCreate(state);
+
+    setContentView(R.layout.conversation_activity);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+    initializeReceivers();
+    initializeResources();
+    initializeTitleBar();
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    initializeSecurity(recipients);
+    initializeTitleBar();
+    calculateCharactersRemaining();
+  }
+
+  @Override
+  protected void onStart() {
+    super.onStart();
+
+    if (!isExistingConversation())
+      initializeRecipientsInput();
+
+    registerPassphraseActivityStarted();
+  }
+
+  @Override
+  protected void onStop() {
+    super.onStop();
+
+    registerPassphraseActivityStopped();
+  }
+
+  @Override
+  protected void onDestroy() {
+    unregisterReceiver(killActivityReceiver);
+    unregisterReceiver(securityUpdateReceiver);
+    MemoryCleaner.clean(masterSecret);
+    super.onDestroy();
+  }
+
+  @Override
+  public void onActivityResult(int reqCode, int resultCode, Intent data) {
+    Log.w("ComposeMessageActivity", "onActivityResult called: " + resultCode + " , " + data);
+    super.onActivityResult(reqCode, resultCode, data);
+
+    if (data == null || resultCode != Activity.RESULT_OK)
+      return;
+
+    switch (reqCode) {
+    case PICK_CONTACT:
+      Recipients recipients = (Recipients)data.getParcelableExtra("recipients");
+
+      if (recipients != null)
+        recipientsPanel.addRecipients(recipients);
+
+      break;
+    case PICK_IMAGE:
+      addAttachmentImage(data.getData());
+      break;
+    case PICK_VIDEO:
+      addAttachmentVideo(data.getData());
+      break;
+    case PICK_AUDIO:
+      addAttachmentAudio(data.getData());
+      break;
+    }
+  }
+
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    MenuInflater inflater = this.getSupportMenuInflater();
+    menu.clear();
+
+    if (isSingleExistingConversation() && sendEncrypted)
+    {
+      if (isAuthenticatedSession()) {
+        inflater.inflate(R.menu.conversation_secure_verified, menu);
+      } else {
+        inflater.inflate(R.menu.conversation_secure_unverified, menu);
+      }
+    } else if (isSingleExistingConversation()) {
+      inflater.inflate(R.menu.conversation_insecure, menu);
+    }
+
+    inflater.inflate(R.menu.conversation, menu);
+    super.onPrepareOptionsMenu(menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+    switch (item.getItemId()) {
+    case R.id.menu_call:                 handleDial(recipients.getPrimaryRecipient()); return true;
+    case R.id.menu_delete_thread:        handleDeleteThread();                         return true;
+    case R.id.menu_add_attachment:       handleAddAttachment();                        return true;
+    case R.id.menu_start_secure_session: handleStartSecureSession();                   return true;
+    case R.id.menu_abort_session:        handleAbortSecureSession();                   return true;
+    case R.id.menu_verify_recipient:     handleVerifyRecipient();                      return true;
+    case R.id.menu_verify_session:       handleVerifySession();                        return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+    if (sendEncrypted) {
+      android.view.MenuInflater inflater = getMenuInflater();
+      inflater.inflate(R.menu.conversation_button_context, menu);
+    }
+  }
+
+  @Override
+  public boolean onContextItemSelected(android.view.MenuItem item) {
+    switch (item.getItemId()) {
+    case R.id.menu_context_send_unencrypted: sendMessage(false); return true;
+    }
+
+    return false;
+  }
+
+  //////// Event Handlers
+
+  private void handleVerifyRecipient() {
+    Intent verifyIdentityIntent = new Intent(this, VerifyIdentityActivity.class);
+    verifyIdentityIntent.putExtra("recipient", recipients.getPrimaryRecipient());
+    verifyIdentityIntent.putExtra("master_secret", masterSecret);
+    startActivity(verifyIdentityIntent);
+  }
+
+  private void handleVerifySession() {
+    Intent verifyKeysIntent = new Intent(this, VerifyKeysActivity.class);
+    verifyKeysIntent.putExtra("recipient", recipients.getPrimaryRecipient());
+    verifyKeysIntent.putExtra("master_secret", masterSecret);
+    startActivity(verifyKeysIntent);
+  }
+
+  private void handleStartSecureSession() {
+    Recipient recipient         = recipients.getPrimaryRecipient();
+    String recipientName        = (recipient.getName() == null ? recipient.getNumber() : recipient.getName());
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setTitle("Initiate Secure Session?");
+    builder.setIcon(android.R.drawable.ic_dialog_info);
+    builder.setCancelable(true);
+    builder.setMessage("Initiate secure session with " + recipientName + "?");
+    builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        KeyExchangeInitiator.initiate(ConversationActivity.this, masterSecret,
+                                      recipients.getPrimaryRecipient(), true);
+      }
+    });
+
+    builder.setNegativeButton(R.string.no, null);
+    builder.show();
+  }
+
+  private void handleAbortSecureSession() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setTitle("Abort Secure Session Confirmation");
+    builder.setIcon(android.R.drawable.ic_dialog_alert);
+    builder.setCancelable(true);
+    builder.setMessage("Are you sure that you want to abort this secure session?");
+    builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        if (recipients != null && recipients.isSingleRecipient()) {
+          KeyUtil.abortSessionFor(ConversationActivity.this, recipients.getPrimaryRecipient());
+          initializeSecurity(recipients);
+          initializeTitleBar();
+        }
+      }
+    });
+    builder.setNegativeButton(R.string.no, null);
+    builder.show();
+  }
+
+  private void handleDial(Recipient recipient) {
+    if (recipient == null) return;
+
+    Intent dialIntent = new Intent(Intent.ACTION_DIAL,
+                            Uri.parse("tel:" + recipient.getNumber()));
+    startActivity(dialIntent);
+  }
+
+  private void handleDeleteThread() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setTitle("Delete Thread Confirmation");
+    builder.setIcon(android.R.drawable.ic_dialog_alert);
+    builder.setCancelable(true);
+    builder.setMessage("Are you sure that you want to permanently delete this conversation?");
+    builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        if (threadId > 0) {
+          DatabaseFactory.getThreadDatabase(ConversationActivity.this).deleteConversation(threadId);
+          finish();
+        }
+      }
+    });
+
+    builder.setNegativeButton(R.string.no, null);
+    builder.show();
+  }
+
+  private void handleAddAttachment() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setIcon(R.drawable.ic_dialog_attach);
+    builder.setTitle("Add attachment");
+    builder.setAdapter(attachmentAdapter, new AttachmentTypeListener());
+    builder.show();
+  }
+
+  ///// Initializers
+
+  private void initializeTitleBar() {
+    String title    = null;
+    String subtitle = null;
+
+    if (isSingleExistingConversation()) {
+
+      if (sendEncrypted) {
+        title = AuthenticityCalculator.getAuthenticatedName(this,
+                                                            recipients.getPrimaryRecipient(),
+                                                            masterSecret);
+      }
+
+      if (title == null || title.trim().length() == 0) {
+        title = recipients.getPrimaryRecipient().getName();
+      }
+
+      if (title == null || title.trim().length() == 0) {
+        title = recipients.getPrimaryRecipient().getNumber();
+      } else {
+        subtitle = recipients.getPrimaryRecipient().getNumber();
+      }
+    } else {
+      title = "Compose Message";
+    }
+
+    this.getSupportActionBar().setTitle(title);
+
+    if (subtitle != null)
+      this.getSupportActionBar().setSubtitle(PhoneNumberUtils.formatNumber(subtitle));
+
+    this.invalidateOptionsMenu();
+  }
+
+  private void initializeSecurity(Recipients recipients) {
+    if (isSingleExistingConversation() &&
+        KeyUtil.isSessionFor(this, recipients.getPrimaryRecipient()))
+    {
+      sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_small, 0);
+      sendButton.setCompoundDrawablePadding(10);
+      this.sendEncrypted       = true;
+      this.characterCalculator = new EncryptedCharacterCalculator();
+    } else {
+      sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+      this.sendEncrypted       = false;
+      this.characterCalculator = new CharacterCalculator();
+    }
+
+    calculateCharactersRemaining();
+  }
+
+  private void initializeResources() {
+    recipientsPanel     = (RecipientsPanel)findViewById(R.id.recipients);
+    recipients          = getIntent().getParcelableExtra("recipients");
+    threadId            = getIntent().getLongExtra("thread_id", -1);
+    addContactButton    = (ImageButton)findViewById(R.id.contacts_button);
+    sendButton          = (Button)findViewById(R.id.send_button);
+    composeText         = (EditText)findViewById(R.id.embedded_text_editor);
+    masterSecret        = (MasterSecret)getIntent().getParcelableExtra("master_secret");
+    charactersLeft      = (TextView)findViewById(R.id.space_left);
+
+    attachmentAdapter   = new AttachmentTypeSelectorAdapter(this);
+    attachmentManager   = new AttachmentManager(this);
+
+    SendButtonListener sendButtonListener = new SendButtonListener();
+
+    recipientsPanel.setPanelChangeListener(new RecipientsPanelChangeListener());
+    sendButton.setOnClickListener(sendButtonListener);
+    addContactButton.setOnClickListener(new AddRecipientButtonListener());
+    composeText.setOnKeyListener(new ComposeKeyPressedListener());
+    composeText.addTextChangedListener(new OnTextChangedListener());
+    composeText.setOnEditorActionListener(sendButtonListener);
+
+    registerForContextMenu(sendButton);
+
+    if (getIntent().getStringExtra("forwarded_message") != null)
+      composeText.setText("FWD: " + getIntent().getStringExtra("forwarded_message"));
+  }
+
+  private void initializeRecipientsInput() {
+    recipientsPanel.setVisibility(View.VISIBLE);
+
+    if (this.recipients != null) {
+      recipientsPanel.addRecipients(this.recipients);
+    }
+  }
+
+
+  private void initializeReceivers() {
+    killActivityReceiver   = new BroadcastReceiver() {
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        finish();
+      }
+    };
+
+    securityUpdateReceiver = new BroadcastReceiver() {
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        if (intent.getLongExtra("thread_id", -1) == -1)
+          return;
+
+        if (intent.getLongExtra("thread_id", -1) == threadId) {
+          initializeSecurity(recipients);
+          initializeTitleBar();
+          calculateCharactersRemaining();
+        }
+      }
+    };
+
+    registerReceiver(killActivityReceiver,
+                     new IntentFilter(KeyCachingService.PASSPHRASE_EXPIRED_EVENT),
+                     KeyCachingService.KEY_PERMISSION, null);
+
+    registerReceiver(securityUpdateReceiver,
+                     new IntentFilter(KeyExchangeProcessor.SECURITY_UPDATE_EVENT),
+                     KeyCachingService.KEY_PERMISSION, null);
+  }
+
+
+  //////// Helper Methods
+
+  private void addAttachment(int type) {
+    Log.w("ComposeMessageActivity", "Selected: " + type);
+    switch (type) {
+    case AttachmentTypeSelectorAdapter.ADD_IMAGE:
+      AttachmentManager.selectImage(this, PICK_IMAGE); break;
+    case AttachmentTypeSelectorAdapter.ADD_VIDEO:
+      AttachmentManager.selectVideo(this, PICK_VIDEO); break;
+    case AttachmentTypeSelectorAdapter.ADD_SOUND:
+      AttachmentManager.selectAudio(this, PICK_AUDIO); break;
+    }
+  }
+
+  private void addAttachmentImage(Uri imageUri) {
+    try {
+      attachmentManager.setImage(imageUri);
+    } catch (IOException e) {
+      attachmentManager.clear();
+      Toast.makeText(this, "Sorry, there was an error setting your attachment.",
+                     Toast.LENGTH_LONG).show();
+      Log.w("ComposeMessageActivity", e);
+    }
+  }
+
+  private void addAttachmentVideo(Uri videoUri) {
+    try {
+      attachmentManager.setVideo(videoUri);
+    } catch (IOException e) {
+      attachmentManager.clear();
+      Toast.makeText(this, "Sorry, there was an error setting your attachment.",
+                     Toast.LENGTH_LONG).show();
+      Log.w("ComposeMessageActivity", e);
+    } catch (MediaTooLargeException e) {
+      attachmentManager.clear();
+      Toast.makeText(this, "Sorry, the selected video exceeds message size restrictions.",
+                     Toast.LENGTH_LONG).show();
+      Log.w("ComposeMessageActivity", e);
+    }
+  }
+
+  private void addAttachmentAudio(Uri audioUri) {
+    try {
+      attachmentManager.setAudio(audioUri);
+    } catch (IOException e) {
+      attachmentManager.clear();
+      Toast.makeText(this, "Sorry, there was an error setting your attachment.",
+                     Toast.LENGTH_LONG).show();
+      Log.w("ComposeMessageActivity", e);
+    } catch (MediaTooLargeException e) {
+      attachmentManager.clear();
+      Toast.makeText(this, "Sorry, the selected audio exceeds message size restrictions.",
+                     Toast.LENGTH_LONG).show();
+      Log.w("ComposeMessageActivity", e);
+    }
+  }
+
+  private void calculateCharactersRemaining() {
+    int charactersSpent                               = composeText.getText().length();
+    CharacterCalculator.CharacterState characterState = characterCalculator.calculateCharacters(charactersSpent);
+    charactersLeft.setText(characterState.charactersRemaining + "/" + characterState.maxMessageSize + " (" + characterState.messagesSpent + ")");
+  }
+
+  private boolean isExistingConversation() {
+    return this.recipients != null && this.threadId != -1;
+  }
+
+  private boolean isSingleExistingConversation() {
+    return this.recipients != null && this.recipients.isSingleRecipient();
+  }
+
+  private boolean isAuthenticatedSession() {
+    return AuthenticityCalculator.isAuthenticated(this,
+                                                  recipients.getPrimaryRecipient(),
+                                                  masterSecret);
+  }
+
+  private Recipients getRecipients() throws RecipientFormattingException {
+    if (isExistingConversation()) return this.recipients;
+    else                          return recipientsPanel.getRecipients();
+  }
+
+  private String getMessage() throws InvalidMessageException {
+    SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+    String rawText       = composeText.getText().toString();
+
+    if (rawText.length() < 1 && !attachmentManager.isAttachmentPresent())
+      throw new InvalidMessageException("Message is empty!");
+
+    if (!sendEncrypted && sp.getBoolean(ApplicationPreferencesActivity.WHITESPACE_PREF, true) && rawText.length() <= 145)
+      rawText = rawText + "             ";
+
+    return rawText;
+  }
+
+  private void sendComplete(Recipients recipients, long threadId) {
+    attachmentManager.clear();
+    recipientsPanel.disable();
+    composeText.setText("");
+
+    this.recipients = recipients;
+    this.threadId   = threadId;
+
+    if (this.recipientsPanel.getVisibility() == View.VISIBLE) {
+      ///XXX call down to fragment!  ??
+
+//      initializeConversationAdapter();
+      this.recipientsPanel.setVisibility(View.GONE);
+      initializeTitleBar();
+    }
+  }
+
+  private void sendMessage(boolean sendEncrypted) {
+    try {
+      Recipients recipients   = getRecipients();
+      String message          = getMessage();
+      long allocatedThreadId;
+
+      if (attachmentManager.isAttachmentPresent()) {
+        allocatedThreadId = MessageSender.sendMms(ConversationActivity.this, masterSecret, recipients,
+                                                  threadId, attachmentManager.getSlideDeck(), message,
+                                                  sendEncrypted);
+      } else if (recipients.isEmailRecipient()) {
+        allocatedThreadId = MessageSender.sendMms(ConversationActivity.this, masterSecret, recipients,
+                                                  threadId, new SlideDeck(), message, sendEncrypted);
+      } else {
+        allocatedThreadId = MessageSender.send(ConversationActivity.this, masterSecret, recipients,
+                                               threadId, message, sendEncrypted);
+      }
+
+      sendComplete(recipients, allocatedThreadId);
+      MessageNotifier.updateNotification(ConversationActivity.this, false);
+    } catch (RecipientFormattingException ex) {
+      Toast.makeText(ConversationActivity.this, "Recipient is not a valid SMS or email address!", Toast.LENGTH_LONG).show();
+      Log.w("compose", ex);
+    } catch (InvalidMessageException ex) {
+      Toast.makeText(ConversationActivity.this, "Message is empty!", Toast.LENGTH_SHORT).show();
+      Log.w("compose", ex);
+    } catch (MmsException e) {
+      Log.w("ComposeMessageActivity", e);
+    }
+  }
+
+  private void registerPassphraseActivityStarted() {
+    Intent intent = new Intent(this, KeyCachingService.class);
+    intent.setAction(KeyCachingService.ACTIVITY_START_EVENT);
+    startService(intent);
+  }
+
+  private void registerPassphraseActivityStopped() {
+    Intent intent = new Intent(this, KeyCachingService.class);
+    intent.setAction(KeyCachingService.ACTIVITY_STOP_EVENT);
+    startService(intent);
+  }
+
+  // Listeners
+
+  private class AddRecipientButtonListener implements OnClickListener {
+    public void onClick(View v) {
+      Intent intent = new Intent(ConversationActivity.this, ContactSelectionActivity.class);
+      startActivityForResult(intent, PICK_CONTACT);
+    }
+  };
+
+  private class AttachmentTypeListener implements DialogInterface.OnClickListener {
+    public void onClick(DialogInterface dialog, int which) {
+      addAttachment(attachmentAdapter.buttonToCommand(which));
+    }
+  }
+
+  private class RecipientsPanelChangeListener implements RecipientsPanel.RecipientsPanelChangedListener {
+    public void onRecipientsPanelUpdate(Recipients recipients) {
+      initializeSecurity(recipients);
+    }
+  }
+
+  private class SendButtonListener implements OnClickListener, TextView.OnEditorActionListener {
+    public void onClick(View v) {
+      sendMessage(sendEncrypted);
+    }
+
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+      if (actionId == EditorInfo.IME_ACTION_SEND) {
+        sendButton.performClick();
+        composeText.clearFocus();
+        return true;
+      }
+      return false;
+    }
+  };
+
+  private class OnTextChangedListener implements TextWatcher {
+    public void afterTextChanged(Editable s) {
+      calculateCharactersRemaining();
+    }
+    public void beforeTextChanged(CharSequence s, int start, int count,int after) {}
+    public void onTextChanged(CharSequence s, int start, int before,int count) {}
+
+  }
+
+  private class ComposeKeyPressedListener implements OnKeyListener {
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+      if (event.getAction() == KeyEvent.ACTION_DOWN) {
+        if (keyCode == KeyEvent.KEYCODE_ENTER) {
+          if (PreferenceManager.getDefaultSharedPreferences(ConversationActivity.this).getBoolean("pref_enter_sends", false)) {
+            sendButton.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
+            sendButton.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER));
+            return true;
+          }
+        }
+      }
+
+      return false;
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/ConversationAdapter.java b/src/org/thoughtcrime/securesms/ConversationAdapter.java
index 07d4c69c8b..2fc4e43347 100644
--- a/src/org/thoughtcrime/securesms/ConversationAdapter.java
+++ b/src/org/thoughtcrime/securesms/ConversationAdapter.java
@@ -1,6 +1,6 @@
-/** 
+/**
  * Copyright (C) 2011 Whisper Systems
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -10,13 +10,20 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms;
 
-import java.util.LinkedHashMap;
+import android.content.Context;
+import android.database.Cursor;
+import android.os.Handler;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorAdapter;
 
 import org.thoughtcrime.securesms.crypto.MasterCipher;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
@@ -33,40 +40,34 @@ import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.service.MessageNotifier;
 
 import ws.com.google.android.mms.MmsException;
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Handler;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
+
+import java.util.LinkedHashMap;
 
 /**
  * A cursor adapter for a conversation thread.  Ultimately
  * used by ComposeMessageActivity to display a conversation
  * thread in a ListActivity.
- * 
+ *
  * @author Moxie Marlinspike
  *
  */
 public class ConversationAdapter extends CursorAdapter {
-	
+
   private static final int MAX_CACHE_SIZE = 40;
 
   private final TouchListener touchListener = new TouchListener();
   private final LinkedHashMap<String,MessageRecord> messageRecordCache;
   private final Handler failedIconClickHandler;
-  private final long threadId;	
+  private final long threadId;
   private final Context context;
   private final Recipients recipients;
   private final MasterSecret masterSecret;
   private final MasterCipher masterCipher;
-	
+
   private boolean dataChanged;
-		
-  public ConversationAdapter(Recipients recipients, long threadId, Context context, Cursor c, MasterSecret masterSecret, Handler failedIconClickHandler) {
-    super(context, c);
+
+  public ConversationAdapter(Recipients recipients, long threadId, Context context, MasterSecret masterSecret, Handler failedIconClickHandler) {
+    super(context, null);
     this.context                = context;
     this.recipients             = recipients;
     this.threadId               = threadId;
@@ -75,14 +76,14 @@ public class ConversationAdapter extends CursorAdapter {
     this.dataChanged            = false;
     this.failedIconClickHandler = failedIconClickHandler;
     this.messageRecordCache     = initializeCache();
-		
+
     DatabaseFactory.getThreadDatabase(context).setRead(threadId);
     MessageNotifier.updateNotification(context, false);
   }
-	
+
   private Recipient buildRecipient(String address) {
     Recipient recipient;
-		
+
     try {
       if (address == null) recipient = recipients.getPrimaryRecipient();
       else                 recipient = RecipientFactory.getRecipientsFromString(context, address).getPrimaryRecipient();
@@ -90,17 +91,17 @@ public class ConversationAdapter extends CursorAdapter {
       Log.w("ConversationAdapter", e);
       recipient = new Recipient("Unknown", "Unknown", null);
     }
-		
+
     return recipient;
   }
-	
+
   @Override
   public void bindView(View view, Context context, Cursor cursor) {
     long id                     = cursor.getLong(cursor.getColumnIndexOrThrow(SmsDatabase.ID));
     String type                 = cursor.getString(cursor.getColumnIndexOrThrow(SmsDatabase.TRANSPORT));
     MessageRecord messageRecord = getMessageRecord(id, cursor, type);
-		
-    ((ConversationItem)view).set(masterSecret, messageRecord, failedIconClickHandler);		
+
+    ((ConversationItem)view).set(masterSecret, messageRecord, failedIconClickHandler);
     view.setOnTouchListener(touchListener);
   }
 
@@ -111,12 +112,12 @@ public class ConversationAdapter extends CursorAdapter {
 
     return view;
   }
-	
+
   private MessageRecord getNewMmsMessageRecord(long messageId, Cursor cursor) {
     MessageRecord messageRecord = getNewSmsMessageRecord(messageId, cursor);
     long mmsType                = cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.MESSAGE_TYPE));
     long mmsBox                 = cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.MESSAGE_BOX));
-		
+
     try {
       return MmsFactory.getMms(context, masterSecret, messageRecord, mmsType, mmsBox);
     } catch (MmsException me) {
@@ -124,64 +125,65 @@ public class ConversationAdapter extends CursorAdapter {
       return messageRecord;
     }
   }
-	
+
   private MessageRecord getNewSmsMessageRecord(long messageId, Cursor cursor) {
     long date                   = cursor.getLong(cursor.getColumnIndexOrThrow(SmsDatabase.DATE));
     long type                   = cursor.getLong(cursor.getColumnIndexOrThrow(SmsDatabase.TYPE));
     String address              = cursor.getString(cursor.getColumnIndexOrThrow(SmsDatabase.ADDRESS));
     Recipient recipient         = buildRecipient(address);
     MessageRecord messageRecord = new MessageRecord(messageId, recipients, date, type, threadId);
-	
+
     messageRecord.setMessageRecipient(recipient);
     setBody(cursor, messageRecord);
-		
+
     return messageRecord;
   }
-	
+
   private MessageRecord getMessageRecord(long messageId, Cursor cursor, String type) {
     if (messageRecordCache.containsKey(type + messageId))
       return messageRecordCache.get(type + messageId);
-		
+
     MessageRecord messageRecord;
-		
+
     if (type.equals("mms"))	messageRecord = getNewMmsMessageRecord(messageId, cursor);
     else					messageRecord = getNewSmsMessageRecord(messageId, cursor);
-		
-    messageRecordCache.put(type + messageId, messageRecord);		
+
+    messageRecordCache.put(type + messageId, messageRecord);
     return messageRecord;
   }
-		
+
   protected void setBody(Cursor cursor, MessageRecord message) {
     String body = cursor.getString(cursor.getColumnIndexOrThrow(SmsDatabase.BODY));
-		
+
     if (body == null)
       message.setBody("");
     else
       MessageDisplayHelper.setDecryptedMessageBody(body, message, masterCipher);
   }
-	
+
+  @Override
   protected void onContentChanged() {
     super.onContentChanged();
     messageRecordCache.clear();
     DatabaseFactory.getThreadDatabase(context).setRead(threadId);
     this.dataChanged = true;
   }
-	
+
   public void close() {
     this.getCursor().close();
   }
-	
+
   private class TouchListener implements View.OnTouchListener {
     public boolean onTouch(View v, MotionEvent event) {
       if (ConversationAdapter.this.dataChanged) {
         ConversationAdapter.this.dataChanged = false;
         MessageNotifier.updateNotification(context, false);
       }
-			
+
       return false;
     }
-  }	
-	
+  }
+
   private LinkedHashMap<String,MessageRecord> initializeCache() {
     return new LinkedHashMap<String,MessageRecord>() {
       @Override
@@ -190,6 +192,6 @@ public class ConversationAdapter extends CursorAdapter {
       }
     };
   }
-	
+
 
 }
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
new file mode 100644
index 0000000000..4d90ebd5b0
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -0,0 +1,176 @@
+package org.thoughtcrime.securesms;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.Loader;
+import android.text.ClipboardManager;
+import android.view.ContextMenu;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorAdapter;
+
+import com.actionbarsherlock.app.SherlockListFragment;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.MessageRecord;
+import org.thoughtcrime.securesms.database.loaders.ConversationLoader;
+import org.thoughtcrime.securesms.recipients.Recipients;
+
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+
+public class ConversationFragment extends SherlockListFragment
+  implements LoaderManager.LoaderCallbacks<Cursor>
+{
+
+  private MasterSecret masterSecret;
+  private Recipients   recipients;
+  private long         threadId;
+
+  @Override
+  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
+    return inflater.inflate(R.layout.conversation_fragment, container, false);
+  }
+
+  @Override
+  public void onActivityCreated(Bundle bundle) {
+    super.onActivityCreated(bundle);
+
+    initializeResources();
+    initializeListAdapter();
+    registerForContextMenu(getListView());
+
+    getLoaderManager().initLoader(0, null, this);
+  }
+
+  @Override
+  public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+    android.view.MenuInflater inflater = this.getSherlockActivity().getMenuInflater();
+    menu.clear();
+
+    inflater.inflate(R.menu.conversation_context, menu);
+  }
+
+  @Override
+  public boolean onContextItemSelected(android.view.MenuItem item) {
+    Cursor cursor                     = ((CursorAdapter)getListAdapter()).getCursor();
+    ConversationItem conversationItem = (ConversationItem)(((ConversationAdapter)getListAdapter()).newView(getActivity(), cursor, null));
+    MessageRecord messageRecord       = conversationItem.getMessageRecord();
+
+    switch(item.getItemId()) {
+    case R.id.menu_context_copy:           handleCopyMessage(messageRecord);     return true;
+    case R.id.menu_context_delete_message: handleDeleteMessage(messageRecord);   return true;
+    case R.id.menu_context_details:        handleDisplayDetails(messageRecord);  return true;
+    case R.id.menu_context_forward:        handleForwardMessage(messageRecord);  return true;
+    }
+
+    return false;
+  }
+
+  private void handleCopyMessage(MessageRecord message) {
+    String body = message.getBody();
+    if (body == null) return;
+
+    ClipboardManager clipboard = (ClipboardManager)getActivity()
+        .getSystemService(Context.CLIPBOARD_SERVICE);
+    clipboard.setText(body);
+  }
+
+  private void handleDeleteMessage(MessageRecord message) {
+    final long messageId   = message.getId();
+    final String transport = message.isMms() ? "mms" : "sms";
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+    builder.setTitle("Delete Message Confirmation");
+    builder.setIcon(android.R.drawable.ic_dialog_alert);
+    builder.setCancelable(true);
+    builder.setMessage("Are you sure that you want to permanently delete this message?");
+
+    builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        if (transport.equals("mms")) {
+          DatabaseFactory.getMmsDatabase(getActivity()).delete(messageId);
+        } else {
+          DatabaseFactory.getSmsDatabase(getActivity()).deleteMessage(messageId);
+        }
+      }
+    });
+
+    builder.setNegativeButton(R.string.no, null);
+    builder.show();
+  }
+
+  private void handleDisplayDetails(MessageRecord message) {
+    String sender    = message.getRecipients().getPrimaryRecipient().getNumber();
+    String transport = message.isMms() ? "mms" : "sms";
+    long date        = message.getDate();
+
+    SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE MMM d, yyyy 'at' hh:mm:ss a zzz");
+    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+    builder.setTitle("Message Details");
+    builder.setIcon(android.R.drawable.ic_dialog_info);
+    builder.setCancelable(false);
+    builder.setMessage("Sender: " + sender + "\nTransport: " + transport.toUpperCase() +
+                       "\nSent/Received: " + dateFormatter.format(new Date(date)));
+    builder.setPositiveButton("Ok", null);
+    builder.show();
+  }
+
+  private void handleForwardMessage(MessageRecord message) {
+    Intent composeIntent = new Intent(getActivity(), ConversationActivity.class);
+    composeIntent.putExtra("forwarded_message", message.getBody());
+    composeIntent.putExtra("master_secret", masterSecret);
+    startActivity(composeIntent);
+  }
+
+  private void initializeResources() {
+    this.masterSecret = (MasterSecret)this.getActivity().getIntent()
+                          .getParcelableExtra("master_secret");
+    this.recipients   = this.getActivity().getIntent().getParcelableExtra("recipients");
+    this.threadId     = this.getActivity().getIntent().getLongExtra("thread_id", -1);
+  }
+
+  private void initializeListAdapter() {
+    if (this.recipients != null && this.threadId != -1) {
+      this.setListAdapter(new ConversationAdapter(recipients, threadId, getActivity(), masterSecret, new FailedIconClickHandler()));
+    }
+  }
+
+  @Override
+  public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
+    if (this.threadId != -1) {
+      return new ConversationLoader(getActivity(), threadId);
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public void onLoadFinished(Loader<Cursor> arg0, Cursor cursor) {
+    ((CursorAdapter)getListAdapter()).changeCursor(cursor);
+  }
+
+  @Override
+  public void onLoaderReset(Loader<Cursor> arg0) {
+    ((CursorAdapter)getListAdapter()).changeCursor(null);
+  }
+
+  private class FailedIconClickHandler extends Handler {
+    @Override
+    public void handleMessage(android.os.Message message) {
+      assert(false);
+//      String failedMessageText = (String)message.obj;
+//      ConversationActivity.this.composeText.setText(failedMessageText);
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 973ac20b3d..7fba4a0603 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -145,7 +145,7 @@ public class ConversationListActivity extends SherlockFragmentActivity
       return;
     }
 
-    Intent intent = new Intent(this, ComposeMessageActivity.class);
+    Intent intent = new Intent(this, ConversationActivity.class);
     intent.putExtra("recipients", recipients);
     intent.putExtra("thread_id", threadId);
     intent.putExtra("master_secret", masterSecret);
diff --git a/src/org/thoughtcrime/securesms/crypto/AuthenticityCalculator.java b/src/org/thoughtcrime/securesms/crypto/AuthenticityCalculator.java
index ce09277430..dd2cce0ed6 100644
--- a/src/org/thoughtcrime/securesms/crypto/AuthenticityCalculator.java
+++ b/src/org/thoughtcrime/securesms/crypto/AuthenticityCalculator.java
@@ -1,6 +1,6 @@
-/** 
+/**
  * Copyright (C) 2011 Whisper Systems
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -10,42 +10,53 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms.crypto;
 
+import android.content.Context;
+
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.SessionRecord;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
-import android.content.Context;
-import android.view.View;
-import android.widget.TextView;
-
 public class AuthenticityCalculator {
 
-  private static void setAuthentictyForIdentity(Context context, MasterSecret masterSecret, IdentityKey identityKey, View grey, View red, TextView titleBar) 
+  private static boolean isAuthenticatedIdentity(Context context,
+                                                 MasterSecret masterSecret,
+                                                 IdentityKey identityKey)
   {
-    String identityName = DatabaseFactory.getIdentityDatabase(context).getNameForIdentity(masterSecret, identityKey);
-		
-    if (identityName == null) {  
-      red.setVisibility(View.VISIBLE);
-      return;
-    }
-				
-    grey.setVisibility(View.VISIBLE);
-    titleBar.setText(identityName);
+    String identityName = DatabaseFactory.getIdentityDatabase(context)
+                            .getNameForIdentity(masterSecret, identityKey);
+
+    if (identityName == null) return false;
+    else                      return true;
   }
-	
-  public static void setAuthenticityStatus(Context context, Recipient recipient, MasterSecret masterSecret, View grey, View red, TextView titleBar) 
+
+  public static String getAuthenticatedName(Context context,
+                                            Recipient recipient,
+                                            MasterSecret masterSecret)
   {
     SessionRecord session = new SessionRecord(context, masterSecret, recipient);
-		
-    if      (session.isVerifiedSession())      grey.setVisibility(View.VISIBLE);
-    else if (session.getIdentityKey() != null) setAuthentictyForIdentity(context, masterSecret, session.getIdentityKey(), grey, red, titleBar);			
-    else                                       red.setVisibility(View.VISIBLE);
+    return DatabaseFactory.getIdentityDatabase(context)
+             .getNameForIdentity(masterSecret, session.getIdentityKey());
   }
-	
+
+  public static boolean isAuthenticated(Context context,
+                                        Recipient recipient,
+                                        MasterSecret masterSecret)
+  {
+    SessionRecord session = new SessionRecord(context, masterSecret, recipient);
+
+    if (session.isVerifiedSession()) {
+      return true;
+    } else if (session.getIdentityKey() != null) {
+      return isAuthenticatedIdentity(context, masterSecret, session.getIdentityKey());
+    }
+
+    return false;
+  }
+
 }
diff --git a/src/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java b/src/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java
new file mode 100644
index 0000000000..ecafcf7d78
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java
@@ -0,0 +1,23 @@
+package org.thoughtcrime.securesms.database.loaders;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.v4.content.CursorLoader;
+
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+
+public class ConversationLoader extends CursorLoader {
+  private final Context context;
+  private final long threadId;
+
+  public ConversationLoader(Context context, long threadId) {
+    super(context);
+    this.context  = context.getApplicationContext();
+    this.threadId = threadId;
+  }
+
+  @Override
+  public Cursor loadInBackground() {
+    return DatabaseFactory.getMmsSmsDatabase(context).getConversation(threadId);
+  }
+}