From 5eb04328d32b1e907e2e607eb39226484b5d3642 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 17 Feb 2013 11:42:30 -0800
Subject: [PATCH] Improve passphrase and onboarding UI. Abstract out routing.

1) Update the create, prompt, and change passphrase activities.
   They are no longer dialog themed, and should look a little
   less ugly.

2) Update the import DB activity to be less ugly and more robust.

3) Abstract all of the state handling stuff out of
   ConversationListActivity.  This is now handled by RoutingActivity,
   which all launch intents move through.
---
 AndroidManifest.xml                           |  28 +-
 res/drawable-hdpi/import_database.png         | Bin 0 -> 1955 bytes
 res/drawable-hdpi/padlock_prompt.png          | Bin 0 -> 4481 bytes
 res/drawable-mdpi/import_database.png         | Bin 0 -> 1489 bytes
 res/drawable-mdpi/padlock_prompt.png          | Bin 0 -> 2098 bytes
 res/drawable-xhdpi/import_database.png        | Bin 0 -> 1218 bytes
 res/drawable-xhdpi/padlock_prompt.png         | Bin 0 -> 3942 bytes
 res/drawable/background_pattern.png           | Bin 0 -> 291 bytes
 res/drawable/background_pattern_repeat.xml    |   3 +
 res/layout/change_passphrase_activity.xml     | 143 +++++------
 res/layout/create_passphrase_activity.xml     | 141 ++++++-----
 res/layout/database_migration_activity.xml    | 126 +++++++++
 res/layout/prompt_passphrase_activity.xml     |  89 ++++---
 res/values/strings.xml                        |  36 ++-
 res/values/styles.xml                         |  48 ++++
 .../ApplicationMigrationManager.java          | 121 ---------
 .../ApplicationPreferencesActivity.java       |  13 +-
 .../securesms/ConversationActivity.java       |  10 +-
 .../securesms/ConversationListActivity.java   | 192 +-------------
 .../securesms/DatabaseMigrationActivity.java  | 189 ++++++++++++++
 .../securesms/PassphraseActivity.java         |  12 +-
 .../securesms/PassphraseCreateActivity.java   |  52 ++--
 .../securesms/PassphrasePromptActivity.java   |  11 +-
 .../securesms/RoutingActivity.java            | 218 ++++++++++++++++
 .../securesms/crypto/MasterSecretUtil.java    | 147 +++++------
 .../securesms/database/SmsMigrator.java       |  57 +++--
 .../notifications/MessageNotifier.java        |   6 +-
 .../notifications/NotificationItem.java       |   4 +-
 .../service/ApplicationMigrationService.java  | 239 ++++++++++++------
 .../securesms/service/KeyCachingService.java  |  10 +-
 30 files changed, 1177 insertions(+), 718 deletions(-)
 create mode 100644 res/drawable-hdpi/import_database.png
 create mode 100644 res/drawable-hdpi/padlock_prompt.png
 create mode 100644 res/drawable-mdpi/import_database.png
 create mode 100644 res/drawable-mdpi/padlock_prompt.png
 create mode 100644 res/drawable-xhdpi/import_database.png
 create mode 100644 res/drawable-xhdpi/padlock_prompt.png
 create mode 100644 res/drawable/background_pattern.png
 create mode 100644 res/drawable/background_pattern_repeat.xml
 create mode 100644 res/layout/database_migration_activity.xml
 delete mode 100644 src/org/thoughtcrime/securesms/ApplicationMigrationManager.java
 create mode 100644 src/org/thoughtcrime/securesms/DatabaseMigrationActivity.java
 create mode 100644 src/org/thoughtcrime/securesms/RoutingActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b11ae1c641..8bdd09350b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -35,10 +35,9 @@
                  android:label="@string/app_name"
                  android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
 
-        <activity android:name=".ConversationListActivity"
-                  android:label="@string/app_name"
+        <activity android:name=".RoutingActivity"
+                  android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"            
                   android:launchMode="singleTask"
-                  android:uiOptions="splitActionBarWhenNarrow"
                   android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
 
             <intent-filter>
@@ -62,22 +61,34 @@
             </intent-filter>            
             
         </activity>
+        
+    <activity android:name=".ConversationListActivity"
+              android:label="@string/app_name"
+              android:launchMode="singleTask"
+              android:uiOptions="splitActionBarWhenNarrow"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".DatabaseMigrationActivity"
+              android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>              
+    
     <activity android:name=".PassphraseCreateActivity"
-              android:theme="@style/Theme.Sherlock.Light.Dialog"
               android:label="@string/AndroidManifest__create_passphrase"
-              android:launchMode="singleInstance"
+              android:windowSoftInputMode="stateUnchanged"
+              android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"
+              android:launchMode="singleTop"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphrasePromptActivity"
-              android:theme="@style/Theme.Sherlock.Light.Dialog"
               android:label="@string/AndroidManifest__enter_passphrase"
-              android:launchMode="singleInstance"
-              android:windowSoftInputMode="stateVisible"
+              android:launchMode="singleTop"
+              android:theme="@style/NoAnimation.Theme.Sherlock.Light.DarkActionBar"              
+              android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ContactSelectionActivity"
@@ -95,7 +106,6 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphraseChangeActivity"
-              android:theme="@style/Theme.Sherlock.Light.Dialog"
               android:label="@string/AndroidManifest__change_passphrase"
               android:launchMode="singleInstance"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
diff --git a/res/drawable-hdpi/import_database.png b/res/drawable-hdpi/import_database.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59a8ac06526ff7e057ceb73834c7cd3ac0f6501
GIT binary patch
literal 1955
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
bojp<AShaEY7rm?ebqauXj>sw-pTyq*2XUPB

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/padlock_prompt.png b/res/drawable-hdpi/padlock_prompt.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6d1980cc656cefbb728c487f76ecf9bab0432de
GIT binary patch
literal 4481
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
ThIM{^00000NkvXXu0mjfc%ylf

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/import_database.png b/res/drawable-mdpi/import_database.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1c565b1bb1d774262c92faf89c9e797bbaf12fa
GIT binary patch
literal 1489
zcmYk6c~H^`6vuyf;O12s8KG$h9&Kb|W*O=hO7bJMyec<Kk~|PK63v4S$~4{5@<%Bl
ztBxroDut2dnwzl=Mzxfrc(rOHO1YVZnrRw~v)jzhn|I7--goBx^S=3egZwQ_QKkR@
zSb#*o5Pgqb$RFVP>N%i});D<cZht>Ow-6OA0=Awkq7x$+dPUbl!tl<e8G2}v3I-BP
z{xYyMT)OC`bJaKi7#{}xc7|p2j{Ukb*_MFJ8K8LvBdiu3#AB@P!>}~#qS~KHM*D#t
zA0U!NM1K4c;|h}V5tpBwGXv~un#C*Xz``Bxjq%*2q$^POhqiMG0t%F2%lxgjP1o0r
ziWn2lj?PaB`AoR$^?(}}#U7X!6QSq<c4`7<mD4@g+z79)P^=4WS0J@%;7`y=hHY2L
zq?0@ym|ITKu@5{VTFFC{_ghN<1Wm`zTQ%|g1)Fc=Xh?B$h0BhT%`eGYIp&wnVpk#;
zke-tR;Ii+CeHQy2{kw`p{)a~0kn_`zA=%uf%2V_jvEbY<l@(Q<fM!<$GV`!<Bea=P
z>9%?%zsh8t#2B(O_|nO|m2Y4OL=+zigw!Rz=KbAe&ba4yv&EvU@vqDFKh=8qbNMuA
z-{>iycz$8hF1wRSoxtg_mhlw?Y-Y7Npz7)pH#g$~wRSACyf4Q;qj-V99UxcHBsU7(
zK(&YFU@YXjSGU$6uc-YMO}J&{Pa814Tz)#yrL)4>tt5<nLhhL^kXxyQ6uiH{VLnJ(
z@6o6A5}ZezC|5V5FEAJkr#Sl|o{a&g<T0ml8O#(^;54~05oJ6JKEsj_+{%0yq%Gwh
z>}ZHEun}$3sC;dlnAtO4Nr{Q%xVSh}t2czLatC|YX4bqzSTE=F+QpTr6X@m#CA(?s
zG2AVDJEI5F-au4im~t{T^N602+7N`Z4HyB~?~sXo-`IoZG+?%}(btnU<PbC*5|wKS
zx}5jxz$1t7rTT5xa1ukY97qOku9e8f5TFtL4`!6)y0j7#b4{gE(Pt;$tpwA-!||=&
z?NzsLKI%~MGQnDO8>Ez?tUYET>58dnn`|`RSw9e6F1RsXJJfGaS;LCaL~hDOsFt_w
zP`b;TA(z|~871YSbjkzvoP?4!i2TMl!j6pb3xM@yrZz0ONU}uncV*aB@`LGc@EPp2
z7r#KG3pr4x$!p)(Ufi&vT0)6Gc1;@VU=f{T<;}?=8PYrMxWmX1#b#9Q=jd^U61H#w
zx+Q_shcjbKczo)nXAN(i*3k^<B;{B1i&Y(;ZZGaGnq*IZD|Z|OIB@#gtNWP#DeR+^
zt>Fm5CvMeZVo<@8H)~kswc{v`Fl`VcKM3{v#NS)BeRlPGPMam4L?r}c44zmHae8sk
zMMcw*Y-aIR;N;@Lxx6zv6V`6v+iCt)W8|J)o(78wdy+@3UuBWlskFyXV~Ld5pQ;#s
zgDR;0_OZa`#;Clgi{ol$GynRO#&&kz2SU&A)cdAns@;x@4S5@ZD0lPWC)}(~Wym9H
z$bL~IjJ2~krVBzh)tB&6R0^q2n!@5GHcf`TCarI*1&X6?f2tc;VLcYneV|n`%$dy!
zEgm*yea*;9e|ES}N}C2nsrBd6RM^fz0d>34?E~R=Ocmb{xrIVTVNJ7)S#J16gn8z@
z?MS<>F$WP_SQFAKlfi+LyHYkh4uy5EZR!}G#+g+!Y7!s1ME(AtL`m$oOllr!v9A~!
zt)qMvxPx5|hxWWm-ST2W#CX?85l%Tus8k)z$uc0IuqJY-<xJ$)mI*Q>!o@!Hb%Z_j
ztHZK|`E<QKv~eirmpo;*6gT}8aD4lS*y4>@T9w%IX++OT&|d$gJN!SqP23B)`)UJj
zkfpsT#p*4TCBf@A7kFh_=#~Gs8V=jU(Uw>y&X$i%JrI`*$HMHd#mt05=*=Esf0kQa
ljqxNx>Y{>N`BCobc{8KC@MFzqOZ)WZ3xI?mKM|gM?jJd9v^D?$

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/padlock_prompt.png b/res/drawable-mdpi/padlock_prompt.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b4fc222fd5bc47df44d0298d0d598100b66624f
GIT binary patch
literal 2098
zcmV-22+jA2P)<h;3K|Lk000e1NJLTq003qH004jp1^@s6`NACi00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-2xE;CJNA=c%J|O2fs-~
zK~#9!?VW3^9aR;_e>1JMC8pF^ZELYaF$z>I*g_Bj@sE+D5KM$rLP?-j#rVN035v!j
zi3y~}goOA3qXa^<nwVG~v61k|3bCyvg;u>t@KvcI_-IK*gkH<-@x$4NI~=&&o^$q@
z+54RJPi}70%<MaR{q|aGzh+NC!ZI@?b^bjEI2-sNuo5^CH~}~wSP0Cm+&T$72OI>R
z0`>vF1NHz9SIT_3{M1w=4&y@LW58NqMdh+qkI&wH{U3mz0Y8<rBSlClf>{fE4!F2a
z2)(KW+y>k%X(AOsMGD?wW^Vwl1-=2yuK~tP9`yupouqrl9t^M<xGoWg?EpFiY?O3o
zQyx?{1OqeM5DbwDlxjmg9@uJTzX6st@gQXbe{;E+JqFw!z@*$MdLQt#nSH6+s75A~
zRdUICU`qozB!>0?=KzQ62yJDJP_|?Y1>khx-(mcex5ot6FM$c*RPtA+QLT~mXqI3C
zls5uT0!uRWlGlTChNMTb0u!Lj1NM&?lx{fhmGt{8z*KU|<G{%y2&D?=D6j~4K6Zy7
zdh!oY?g362VJMwOT>=xK&dGbsHNZ`bmu{8xnIyr47V}QpQ|!Zz?Erhj-+Gkx)c(JK
zsSsM00cQg522Kl|kYVdgV0WyLRz&ueKLYO>VhGy~Y?idGJEzU^T&DtGrM-l(a0p|m
z7H~k)+fwwHVT7=b0q+JblQcQ#q@tO98TdNzrXe((uSoh<5@13In*+Qwgo^$X_>iQ1
zv1WNIy~eG;$A{oOMW++gXs;|hz_%lN3Bdi5mUMDftk~V@K}os<xI7p#=49%PF`l)E
z;4NiHx-s<~Nt^0e3o*0PXirc^3+<8yE~kv(EnkaltJ@`Qis>b@=vTlQF+Io3u1;Zq
zd2K`^?UuB$&H;!d!i3}}BY8{<xTdjC7Q)zhz(bKLGevv7f2yg?5N38C@X<)ctpNVo
zZ(YhkS{m@FNbX+%>l%ha80QeFPFD?5mqA0>Wf9!J1w10@t|qq)g^+d_xG_>l`$Qu-
z#>`HMG}Tc6pRaR0eHK8mIy3Jd<mR~p+`BeXZh1n|F4EE+z*P~#;|0Kd{X~L6LfN?y
zVsQc7l!~`ha?Q<=iaW3N<PV$`DHh+B(w^avYxV+1A{2L46Ul#RgfO;S(oxdX)(8<{
zRjpvmY(=D`e|L&RLO8Ps5n*xN9<w5n4R)poCWO{qksvRx6U^Hq+2G+s!x)l&9jT}j
z>jbkXQsrMDZN-=Ycx#<t7DjmBr$}G>Bb2eYPB1ZMr4MER=D7%E99O4-W4QQ#GXN9g
z8Rs|E^83|f24D_HC}U1;U~*7nJ4u@a({k?d!4zX+pVl~fj4M%(@lfU-<6vCgEA!+(
z&b=}ZWiAKf-DU4Cd-8WME(haaJjaaAIL74z%<)uDyZz0q3{YZ#DMFcZQZ$UDsYvxK
zD|Kvjwgk`i;%_kn04fL9%mc2c{a)dMuK4SoGkcEew$VR;jlj<(wPpfTzK(aCPy0}X
zN!rJKEbwp^CFC!meM<UKGkc)w46g~Ma_sI>;6>m;rgwNagy8@?A847`y6&U3%C6A$
zS>PG!IjzVw4d^Fk_Pr{cqT(@|i1#Lyt3Q2H()HDz(dkSd+u>?ft0nE}<e0nM9?9qq
zfFkt19&~#or4N+AdbdMzy0T<|H)~x(8<egof#q(C<hs!BDQSNz#g&#8l|HIZQVV=N
zCed&<3Se5t_<vcc%pAsJz-rp>InE0|^MN(M<2gf`n<<zlft8Y8gjapk6iIu4m1cGv
z@LSr4AY_$G3p2~DMSWjVPp7n+*{!sXiS$r5B>h0r)xDf=7Ch+Fz>gfvaB|AilCJFa
zknGCI<X6yM)@?bMxTE0>9Ygo3$~_x$$u+rvc}CLxgBBv`-rzM3CQ=xSnIC?fLpaL;
zOaW|<aiD1^;}<!Evs^;i{ul?EhBEf&P~lv_OeI>@*n@dXqGgRenAH(;%xVV{uUB?y
z#2j;J4!yFR=E_b0{?;#`;4SX}{^A}JSGNq}HR0ax=2F?5z+7x*mk*F%t^h7{FhiOF
zFtZQ$0p%mW56NiJEGICXukM+deW3>^Uj!Z?vlp#$TaW1&c3BViEbY42!3<G5j%8dE
zuGx`e1#<=S%VX)Gg=-v4O`4Q+poebqv&1>r+QH1`E&YT(2UA0SaWH9WXRo_tNc782
zBL}9}T{7-5!`BOv4)uDIr00qAEf@zgleg5In;eXT$s5d$0ah}1I+#Qff0wp9nBnL@
zA&K`TNk@PK4knF(<!hDUo5~YP{8cc%sXRe2*>nJM0`t(I1xU)K%be3YnA^;3(C2*#
zIGRI)%n8f|jFJ2R1_$GEFe3uyh?^lf9Vvl>ZinP_s09Axc1TWtFUfE{e8klP_Ljgc
zZi}Q;0QYtd#NG~^ji2_Hgd`PZSP@*u^lo}rv$_FZdA9$0U<>|Tm?m?}vyv8@*((85
zKD^*?>W5MQCjt8;z1sL@b`k9l&p4d=pa86rG*KP-cPE~0z?+#~|M0vsTp$y`;_#ap
z!E{ERYHvq5hfLou$v}SwE|Ih<<Q8THQ@LoTq;qM%T6aS?RaZ~?AFvD944f?KB;d|2
cd%vvz1MoeR0z)WY8~^|S07*qoM6N<$f)M=G^#A|>

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/import_database.png b/res/drawable-xhdpi/import_database.png
new file mode 100644
index 0000000000000000000000000000000000000000..a977ebb912423ac0069e94540f09654fbfa310c5
GIT binary patch
literal 1218
zcmeAS@N?(olHy`uVBq!ia0vp^XF!;P4M^H6`FsLWY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjRgA2YvDA5YL71_l;?PZ!6Kid%2**yaUCGPFI^*N`<%
z5-srv=uZ<!S9NJ>(-gSMz**hka7ZhHLFlMs)5GN{DjGs&hL8L`EEW~AH)cPcU;Vyv
zo>|M0<KK_Qzj?p{v`1noue-tgsMn8G_Va$ZT_5kY^FiF4yUUbk+}^3OobA`%|L@<;
zKF{gS(8PGKA;G~wK|-KMnE}S+;W#D;73JYzV|mO0Rsdo$Hx;q~)k2tz2Q8T3%!ULR
zMz8{ifqe`>wJ@_uvxeuyv55SLwWa1KL(4x#y_puYuChgPTK%Lwg>Tp0d98BYcT=P0
z(i*=a&67t=_ZUr9nZ7Jte+Hx5XQh*}*FT=RqqlU=7w7*Q-p)wV{-}0x?Z*2jF0v=j
znwivOc=ngY(YP%I&e2t}$4rcmvVcV+-<jMlovVLlZrHMj$p?LMXQy$`PO@Hm_r)`y
z1|P$NGt!pLNboTZ_A#iPoi^PU#JIb-G7n_n%(H7%*!vEO2>WbzpXu+p4XkRj@8;cp
zk0N%j^*20NlYQL8x~wbLnhnXAWivI^BrdOc9{gq#nDJYr`kj}+8J(zF$IlA9fBC%*
z>bwhlmfU<fXHrVGmABxTn9FbCoXvl((^Q)gfA!SnH1?0XL7suRjm_{ZpReJ;3$?Ri
zWp2W~Wq5X)@zFgFni7|D+BCmiwAGps>brR_<NcOupm)M@s~22;V=zxt_{^+jH?JL7
zc2nh~E6`)FyPn-V0CC?L5#gT9v@T9?Ksn!E4s`U4IRDMcKvg`&v)%%I|8n<i+nH(Y
zANM73Z!f&Vp0!qea*p1|?ETtHWqLmbWUsAPsoZp|euA3kIe+<&$13)zPx`a(i2lc=
zQ$9Vcmj4kbz(4uV&LjD+awh#hW_31eZMEmRb%kBMM$=Xrd&cR0d|yB7iT>m@y+Ako
zluVn@Z}ht2+L`rlxzlc3)>&P9E$0o;Az+t=*`DnK21QTqthck1nilSs_PnQ;*>$&M
z4<v|8<j(Hro(GRZoia#D0P5KA1L42znPv5D{x{8!vRvNvT6X!(+b?^Z4VK;X2iuS~
zBklKP`{slnCqbd>d>o{$O%g0+<p)X+C3Dj1)psU!eLcTS`9-Qp|C}awa27$z8%SA;
z4Mq6C`l#o(b>^<yx{H0r>sy(IGuYpi`xpuEAZ0S7Jc=%S;M1QMxzpk-<)oh8Vh84W
ch6KTVOs{T)y*;_eVF!rs>FVdQ&MBb@0H>|>e*gdg

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/padlock_prompt.png b/res/drawable-xhdpi/padlock_prompt.png
new file mode 100644
index 0000000000000000000000000000000000000000..671f2e5c32931bb83ffbb951adabc9e531998cfa
GIT binary patch
literal 3942
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

literal 0
HcmV?d00001

diff --git a/res/drawable/background_pattern.png b/res/drawable/background_pattern.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac627053e84e057a716d95ce1871f1565eb69745
GIT binary patch
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^!XV56BpAZ2GX;PYXMsm#F#`iPP=Z^Skzv*x37{Z*
ziKnkC`&~v!CQf!c^}GV0&>>G3#}J9jtOpwl84P)t3=W(t|8Ke5L4V^yq58kJ+n2>Y
zTUO!!y;ft5nxtt;p96P{NWl)N<y9)ZNe&8W+Jea$`-CPNHZWhD^+B*B;N6~!*L-5z
z1WkNDnnaqqZ?C?w+sCm;Vbd?6VAdp)D2r*<o7|45pYcz5^l-|%lSRK$IHOu;>}u_r
zCpm{_lE}Wb`#Bf{FRCTWi-bfa)P(RWxUc!9Io-ggl6BpJxYuh}Gs`X9d69McQw8n`
lljr4$o3v@V-8lc3|AqPl)r1;3bD(b+JYD@<);T3K0RWAWWn%yU

literal 0
HcmV?d00001

diff --git a/res/drawable/background_pattern_repeat.xml b/res/drawable/background_pattern_repeat.xml
new file mode 100644
index 0000000000..5e3165a49f
--- /dev/null
+++ b/res/drawable/background_pattern_repeat.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap android:src="@drawable/background_pattern" android:tileMode="repeat"
+  xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/res/layout/change_passphrase_activity.xml b/res/layout/change_passphrase_activity.xml
index 0b901dbd3a..4f2b9bf007 100644
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@@ -1,90 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:fillViewport="true"
+            android:background="@drawable/background_pattern_repeat">
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
-        android:orientation="vertical" >
+        android:layout_height="fill_parent"
+        android:gravity="center" >
+        
+        <LinearLayout android:paddingRight="16dip"
+                      android:paddingLeft="16dip"
+                      android:paddingTop="10dip"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center"
+                      android:visibility="visible"
+                      android:orientation="vertical">
+                
+            <TextView style="@style/Registration.Label"
+                      android:layout_width="fill_parent"
+                      android:textAllCaps="true"
+                      android:text="@string/change_passphrase_activity__old_passphrase" />
+            
+            <EditText android:id="@+id/old_passphrase"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:inputType="textPassword"
+                      android:layout_marginBottom="10dip"
+                      android:singleLine="true"/>
 
-        <TextView
-            android:padding="3dip"
-            android:text="@string/change_passphrase_activity__old_passphrase"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"/>
+            <TextView style="@style/Registration.Label"
+                      android:layout_width="fill_parent"
+                      android:textAllCaps="true"
+                      android:text="@string/change_passphrase_activity__new_passphrase" />
+            
+            <EditText android:id="@+id/new_passphrase"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:inputType="textPassword"
+                      android:singleLine="true"/>
 
-        <EditText
-            android:id="@+id/old_passphrase"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:layout_marginBottom="5dip" />
+           <TextView style="@style/Registration.Label"
+                      android:layout_width="fill_parent"
+                      android:textAllCaps="true"
+                      android:text="@string/change_passphrase_activity__repeat_new_passphrase" />
+            
+            <EditText android:id="@+id/repeat_passphrase"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:inputType="textPassword"
+                      android:singleLine="true"/>
 
-        <TextView
-            android:padding="3dip"
-            android:text="@string/change_passphrase_activity__new_passphrase"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            <LinearLayout android:orientation="horizontal"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_marginTop="30dip">
 
-        <EditText
-            android:id="@+id/new_passphrase"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:layout_marginBottom="5dip" />
-
-        <TextView
-            android:padding="3dip"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/change_passphrase_activity__repeat_new_passphrase"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <EditText
-            android:id="@+id/repeat_passphrase"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:layout_marginBottom="5dip" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dip"
-            android:gravity="right"
-            android:orientation="horizontal" >
-
-            <TableLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:stretchColumns="*"
-                tools:ignore="UselessParent" >
-
-                <TableRow>
-
-                    <Button
+                <Button style="@android:style/Widget.Button"
                         android:id="@+id/cancel_button"
-                        android:layout_width="wrap_content"
+                        android:text="@android:string/cancel"
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="16dip"
-                        android:layout_marginRight="15dip"
-                        android:text="@android:string/cancel" />
-
-                    <Button
+                        android:layout_marginRight="7dip"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
+                
+                <Button style="@android:style/Widget.Button"
                         android:id="@+id/ok_button"
-                        android:layout_width="wrap_content"
+                        android:text="@android:string/ok"
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="16dip"
-                        android:text="@android:string/ok" />
-                </TableRow>
-            </TableLayout>
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>                
+            </LinearLayout>                        
         </LinearLayout>
-    </LinearLayout>
-
+    </FrameLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
index 88cd30ba56..1288737b35 100644
--- a/res/layout/create_passphrase_activity.xml
+++ b/res/layout/create_passphrase_activity.xml
@@ -1,74 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ScrollView android:id="@+id/ScrollView"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            xmlns:android="http://schemas.android.com/apk/res/android">
+            android:fillViewport="true"
+            android:background="@drawable/background_pattern_repeat">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingLeft="16dip"
-                  android:paddingRight="16dip"
-                  android:orientation="vertical">
-
-        <TextView android:text="@string/create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="10dip"
-                  android:layout_marginBottom="10dip"/>
-
-        <TextView android:text="@string/create_passphrase_activity__passphrase"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_margin="5dip"/>
-
-        <EditText android:id="@+id/passphrase_edit"
-                  android:layout_height="wrap_content"
-                  android:layout_width="fill_parent"
-                  android:inputType="textPassword"/>
-
-        <TextView
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:id="@+id/repeat_label"
-                  android:textAppearance="?android:attr/textAppearanceMedium"
-                  android:layout_marginBottom="5dip"
-                  android:layout_marginTop="10dip"
-                  android:text="@string/create_passphrase_activity__repeat"/>
-
-        <EditText
-                  android:layout_height="wrap_content"
-                  android:layout_width="fill_parent"
-                  android:inputType="textPassword"
-                  android:id="@+id/passphrase_edit_repeat"/>
-
-        <LinearLayout android:layout_width="fill_parent"
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center" >
+        
+        <LinearLayout android:id="@+id/create_layout"
+                      android:paddingRight="16dip"
+                      android:paddingLeft="16dip"
+                      android:paddingTop="10dip"
+                      android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
-                      android:orientation="horizontal"
+                      android:layout_gravity="center"
+                      android:visibility="visible"
+                      android:orientation="vertical">
+    
+            <TextView style="@style/Registration.Description"
+                      android:layout_width="fill_parent"
                       android:layout_marginBottom="16dip"
-                      android:gravity="right">
+                      android:layout_marginTop="16dip"
+                      android:text="@string/create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase"/>
+            
+            <TextView style="@style/Registration.Label"
+                      android:layout_width="fill_parent"
+                      android:textAllCaps="true"
+                      android:text="@string/create_passphrase_activity__passphrase" />
+            
+            <EditText android:id="@+id/passphrase_edit"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:inputType="textPassword"
+                      android:layout_marginBottom="10dip"
+                      android:singleLine="true"/>
 
-            <TableLayout android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:stretchColumns="*">
-                <TableRow>
-                    <Button android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@android:string/cancel"
-                            android:id="@+id/cancel_button"
-                            android:layout_marginRight="15dip"
-                            android:layout_marginLeft="16dip"/>
-
-                    <Button android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@android:string/ok"
-                            android:id="@+id/ok_button"
-                            android:layout_marginRight="16dip"/>
-                </TableRow>
-            </TableLayout>
+            <TextView style="@style/Registration.Label"
+                      android:layout_width="fill_parent"
+                      android:textAllCaps="true"
+                      android:text="@string/create_passphrase_activity__repeat" />
+            
+            <EditText android:id="@+id/passphrase_edit_repeat"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:inputType="textPassword"
+                      android:singleLine="true"/>
+                        
+            <Button style="@android:style/Widget.Button"
+                    android:id="@+id/ok_button"
+                    android:text="@string/create_passphrase_activity__continue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_marginTop="20dip"
+                    android:layout_marginBottom="20dip"/>
         </LinearLayout>
-    </LinearLayout>
+        
+        <LinearLayout android:id="@+id/progress_layout"
+                      android:paddingRight="16dip"
+                      android:paddingLeft="16dip"
+                      android:paddingTop="10dip"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center"
+                      android:visibility="gone"
+                      android:orientation="vertical">
+    
+            <TextView style="@style/Registration.BigLabel"
+                      android:layout_width="fill_parent"
+                      android:layout_marginBottom="16dip"
+                      android:layout_marginTop="16dip"
+                      android:gravity="center"
+                      android:text="@string/create_passphrase_activity__generating_secrets"/>
+
+            <ProgressBar android:layout_width="wrap_content"
+                         android:layout_height="wrap_content"
+                         android:indeterminate="true"
+                         android:layout_gravity="center"/>            
+        </LinearLayout>        
+    </FrameLayout>
 </ScrollView>
diff --git a/res/layout/database_migration_activity.xml b/res/layout/database_migration_activity.xml
new file mode 100644
index 0000000000..22a8752cae
--- /dev/null
+++ b/res/layout/database_migration_activity.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:fillViewport="true"
+            android:background="@drawable/background_pattern_repeat">
+
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center" >
+        
+        <LinearLayout android:id="@+id/prompt_layout"
+                      android:paddingRight="16dip"
+                      android:paddingLeft="16dip"
+                      android:paddingTop="10dip"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center"
+                      android:visibility="gone"
+                      android:orientation="vertical">
+    
+            <TextView style="@style/Registration.Description"
+                      android:layout_width="fill_parent"
+                      android:layout_marginBottom="16dip"
+                      android:text="@string/database_migration_activity__would_you_like_to_import_your_existing_text_messages"/>
+            
+            <ImageView android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_gravity="center"
+                       android:src="@drawable/import_database"/>
+        
+            <TextView style="@style/Registration.Description"
+                      android:layout_width="fill_parent"
+                      android:layout_marginBottom="16dip"
+                      android:layout_marginTop="16dip"
+                      android:text="@string/database_migration_activity__the_default_system_database_will_not_be_modified"/>
+            
+            <LinearLayout android:orientation="horizontal"
+                          android:gravity="center"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_marginTop="20dip"
+                          android:layout_marginRight="20dip">
+
+                <Button style="@android:style/Widget.Button"
+                        android:id="@+id/skip_button"
+                        android:text="@string/database_migration_activity__skip"
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right"
+                        android:layout_marginRight="7dip"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>
+                
+                <Button style="@android:style/Widget.Button"
+                        android:id="@+id/import_button"
+                        android:text="@string/database_migration_activity__import"
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>                
+            </LinearLayout>
+        </LinearLayout>
+        
+        <LinearLayout android:id="@+id/progress_layout"
+                      android:paddingRight="16dip"
+                      android:paddingLeft="16dip"
+                      android:paddingTop="10dip"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center"
+                      android:visibility="visible"
+                      android:orientation="vertical">
+    
+            <ImageView android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_gravity="center"
+                       android:src="@drawable/import_database"/>
+            
+            
+            <TextView style="@style/Registration.Description"
+                      android:layout_width="fill_parent"
+                      android:layout_marginTop="34dip"
+                      android:layout_marginBottom="16dip"
+                      android:text="@string/database_migration_activity__this_could_take_a_moment_please_be_patient"/>
+            
+            <RelativeLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dip"
+                android:layout_weight="1.0" >
+
+                <TextView
+                    android:id="@+id/import_status"
+                    style="@style/Registration.Constant"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="0/100"
+                    android:textSize="12.0sp" />
+
+                <TextView
+                    style="@style/Registration.Constant"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:text="@string/database_migration_activity__importing"
+                    android:textAllCaps="true"
+                    android:textSize="12.0sp"
+                    android:textStyle="normal" />
+            </RelativeLayout>
+
+            <ProgressBar
+                android:id="@+id/import_progress"
+                style="@android:style/Widget.ProgressBar.Horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="14.0dip"
+                android:layout_marginTop="2.0dip" />
+            
+        </LinearLayout>        
+    </FrameLayout>
+</ScrollView>
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 018ffb10f1..3c829b3529 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -1,39 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
 
-    <EditText android:inputType="textPassword"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:id="@+id/passphrase_edit"
-              android:password="true"
-              android:layout_margin="16dip"/>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:fillViewport="true"
+            android:background="@drawable/background_pattern_repeat">
 
-    <LinearLayout android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:layout_marginBottom="16dip"
-                  android:gravity="right">
-
-        <TableLayout android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:stretchColumns="*">
-            <TableRow>
-                <Button android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:text="@android:string/cancel"
-                        android:id="@+id/cancel_button"
-                        android:layout_marginRight="15dip"
-                        android:layout_marginLeft="16dip"/>
-
-                <Button android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@android:string/ok"
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center" >
+        
+        <LinearLayout android:id="@+id/prompt_layout"
+                      android:paddingRight="16dip"
+                      android:paddingLeft="16dip"
+                      android:paddingTop="10dip"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center"
+                      android:orientation="vertical">
+                
+            <ImageView android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_gravity="center"
+                       android:layout_marginBottom="30dip"
+                       android:src="@drawable/padlock_prompt"/>
+        
+            <TextView style="@style/Registration.Label"
+                      android:layout_width="fill_parent"
+                      android:textAllCaps="true"
+                      android:text="@string/prompt_passphrase_activity__textsecure_passphrase" />
+            
+            <EditText android:id="@+id/passphrase_edit"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:inputType="textPassword"
+                      android:layout_marginBottom="10dip"
+                      android:singleLine="true"/>                                    
+            
+            <LinearLayout android:orientation="horizontal"
+                          android:gravity="right"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_marginTop="20dip"
+                          android:layout_marginRight="20dip">
+                
+                <Button style="@android:style/Widget.Button"
                         android:id="@+id/ok_button"
-                        android:layout_marginRight="16dip"/>
-            </TableRow>
-        </TableLayout>
-    </LinearLayout>
-</LinearLayout>
+                        android:text="@string/prompt_passphrase_activity__unlock"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="right"
+                        android:textAppearance="?android:attr/textAppearanceMedium"/>                
+            </LinearLayout>
+        </LinearLayout>        
+    </FrameLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f14b07f60b..2abd6556aa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,9 +118,8 @@
     <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Incorrect old passphrase!</string>
     
     <!-- PassphraseCreateActivity -->
-    <string name="PassphraseCreateActivity_passphrases_dont_match_exclamation">Passphrases Don\'t Match!</string>
-    <string name="PassphraseCreateActivity_generating_keypair">Generating KeyPair</string>
-    <string name="PassphraseCreateActivity_generating_a_local_encryption_keypair">Generating a local encryption keypair...</string>
+    <string name="PassphraseCreateActivity_passphrases_dont_match">Passphrases don\'t match</string>
+    <string name="PassphraseCreateActivity_you_must_specify_a_password">You must specify a password</string>
     
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Invalid Passphrase!</string>
@@ -225,8 +224,9 @@
     <string name="MmsSender_currently_unable_to_send_your_mms_message">Currently unable to send your MMS message. It will be sent once service becomes available.</string>
     
     <!-- ApplicationMigrationService -->
-    <string name="ApplicationMigrationService_migrating">Migrating</string>
-    <string name="ApplicationMigrationService_migrating_system_text_messages">Migrating System Text Messages</string>
+    <string name="ApplicationMigrationService_import_in_progress">Import in progress</string>
+    <string name="ApplicationMigrationService_importing_text_messages">Importing Text Messages</string>
+    <string name="ApplicationMigrationService_import_complete">Import complete!</string>
     
     <!-- KeyCachingService -->
     <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Passphrase Cached</string>
@@ -251,9 +251,9 @@
     <string name="auto_initiate_activity__initiate_exchange">Initiate Exchange</string>
     
     <!-- change_passphrase_activity -->
-    <string name="change_passphrase_activity__old_passphrase">Old passphrase:</string>
-    <string name="change_passphrase_activity__new_passphrase">New passphrase:</string>
-    <string name="change_passphrase_activity__repeat_new_passphrase">Repeat new passphrase:</string>
+    <string name="change_passphrase_activity__old_passphrase">OLD PASSPHRASE:</string>
+    <string name="change_passphrase_activity__new_passphrase">NEW PASSPHRASE:</string>
+    <string name="change_passphrase_activity__repeat_new_passphrase">REPEAT NEW PASSPHRASE:</string>
     
     <!-- contact_selection_group_activity -->
     <!-- contact_selection_list_activity -->
@@ -282,9 +282,23 @@
     <string name="conversation_fragment_cab__batch_selection_mode">Batch Selection Mode</string>
     
     <!-- create_passphrase_activity -->
-    <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Please choose a passphrase that will be used to locally encrypt your data.  This should be a strong passphrase.</string>
-    <string name="create_passphrase_activity__passphrase">Passphrase:</string>
-    <string name="create_passphrase_activity__repeat">Repeat:</string>
+    <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Please choose a passphrase that will be used to locally encrypt your data.\n\nThis should be a strong passphrase.</string>
+    <string name="create_passphrase_activity__passphrase">PASSPHRASE:</string>
+    <string name="create_passphrase_activity__repeat">REPEAT:</string>
+    <string name="create_passphrase_activity__continue">Continue</string>
+    <string name="create_passphrase_activity__generating_secrets">GENERATING SECRETS</string>
+    
+    <!-- database_migration_activity -->
+    <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Would you like to import your existing text messages into TextSecure\\\'s encrypted database?</string>
+    <string name="database_migration_activity__the_default_system_database_will_not_be_modified">The default system database will not be modified or altered in any way.</string>
+    <string name="database_migration_activity__skip">Skip</string>
+    <string name="database_migration_activity__import">Import</string>
+    <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">This could take a moment. Please be patient, we\'ll notify you when the import is complete.</string>
+    <string name="database_migration_activity__importing">IMPORTING</string>    
+    
+    <!-- prompt_passphrase_activity -->
+    <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSPHRASE</string>
+    <string name="prompt_passphrase_activity__unlock">Unlock</string>
     
     <!-- receive_key_activity -->
     <string name="receive_key_activity__session">Session</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f313fcceee..b1ca82fe31 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <style name="NoAnimation.Theme.Sherlock.Light.DarkActionBar" parent="@style/Theme.Sherlock.Light.DarkActionBar">
+        <item name="android:windowAnimationStyle">@null</item>        
+    </style>
+    
 	<style name="transparent_progress">
 	    <item name="android:windowFrame">@null</item>
 	    <item name="android:windowBackground">@android:color/transparent</item>
@@ -22,4 +26,48 @@
       <item name="android:textStyle">bold</item>
     </style>
 	
+    <style name="Registration.Description" parent="@android:style/TextAppearance">
+        <item name="android:textSize">16.0sp</item>
+        <item name="android:typeface">sans</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">#ff333333</item>
+        <item name="android:gravity">left</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:shadowColor">#ffffff</item>
+        <item name="android:shadowDx">1.0</item>
+        <item name="android:shadowDy">1.0</item>
+        <item name="android:shadowRadius">0.0</item>
+        <item name="android:lineSpacingMultiplier">1.25</item>
+    </style>
+    
+    <style name="Registration.Label" parent="@android:style/TextAppearance">
+        <item name="android:textSize">12.0sp</item>
+        <item name="android:typeface">sans</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">#ff808080</item>
+        <item name="android:gravity">left</item>
+        <item name="android:layout_gravity">left</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:shadowColor">#ffffff</item>
+        <item name="android:shadowDx">1.0</item>
+        <item name="android:shadowDy">1.0</item>
+        <item name="android:shadowRadius">0.0</item>
+        <item name="android:lineSpacingMultiplier">1.25</item>
+    </style>
+    
+    <style name="Registration.BigLabel" parent="@style/Registration.Label">
+        <item name="android:textSize">20sp</item>
+    </style>
+    
+    <style name="Registration.Constant" parent="@android:style/TextAppearance">
+        <item name="android:typeface">sans</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">#ff808080</item>
+        <item name="android:shadowColor">#ffffff</item>
+        <item name="android:shadowDx">1.0</item>
+        <item name="android:shadowDy">1.0</item>
+        <item name="android:shadowRadius">0.0</item>
+        <item name="android:lineSpacingMultiplier">1.25</item>        
+    </style>
+	
 </resources>
diff --git a/src/org/thoughtcrime/securesms/ApplicationMigrationManager.java b/src/org/thoughtcrime/securesms/ApplicationMigrationManager.java
deleted file mode 100644
index d64a8f93b0..0000000000
--- a/src/org/thoughtcrime/securesms/ApplicationMigrationManager.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.app.AlertDialog;
-import android.app.ProgressDialog;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.service.ApplicationMigrationService;
-
-public class ApplicationMigrationManager extends Handler {
-
-  private ProgressDialog progressDialog;
-  private ApplicationMigrationListener listener;
-
-  private final Context context;
-  private final MasterSecret masterSecret;
-
-  public ApplicationMigrationManager(Context context,
-                                     MasterSecret masterSecret)
-  {
-    this.masterSecret = masterSecret;
-    this.context      = context;
-  }
-
-  public void setMigrationListener(ApplicationMigrationListener listener) {
-    this.listener = listener;
-  }
-
-  private void displayMigrationProgress() {
-    progressDialog = new ProgressDialog(context);
-    progressDialog.setTitle(context.getString(R.string.ApplicationMigrationManager_migrating_database));
-    progressDialog.setMessage(context.getString(R.string.ApplicationMigrationManager_migrating_text_message_database));
-    progressDialog.setMax(10000);
-    progressDialog.setCancelable(false);
-    progressDialog.setIndeterminate(false);
-    progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-    progressDialog.show();
-  }
-
-  public void migrate() {
-    context.bindService(new Intent(context, ApplicationMigrationService.class),
-                        serviceConnection, Context.BIND_AUTO_CREATE);
-  }
-
-  private void displayMigrationPrompt() {
-    AlertDialog.Builder alertBuilder = new AlertDialog.Builder(context);
-    alertBuilder.setTitle(R.string.ApplicationMigrationManager_copy_system_text_message_database_question);
-    alertBuilder.setMessage(R.string.ApplicationMigrationManager_copy_system_text_message_database_explanation);
-    alertBuilder.setCancelable(false);
-
-    alertBuilder.setPositiveButton(R.string.ApplicationMigrationManager_copy,
-                                   new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialog, int which) {
-        displayMigrationProgress();
-        Intent intent = new Intent(context, ApplicationMigrationService.class);
-        intent.setAction(ApplicationMigrationService.MIGRATE_DATABASE);
-        intent.putExtra("master_secret", masterSecret);
-        context.startService(intent);
-      }
-    });
-
-    alertBuilder.setNegativeButton(R.string.ApplicationMigrationManager_dont_copy,
-                                   new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialog, int which) {
-        context.getSharedPreferences("SecureSMS", Context.MODE_PRIVATE)
-          .edit()
-          .putBoolean("migrated", true).commit();
-        listener.applicationMigrationComplete();
-      }
-    });
-
-    alertBuilder.create().show();
-  }
-
-  @Override
-  public void handleMessage(Message message) {
-    switch (message.what) {
-    case ApplicationMigrationService.PROGRESS_UPDATE:
-      if (progressDialog != null) {
-        progressDialog.setProgress(message.arg1);
-        progressDialog.setSecondaryProgress(message.arg2);
-      }
-      break;
-    case ApplicationMigrationService.PROGRESS_COMPLETE:
-      if (progressDialog != null) {
-        progressDialog.dismiss();
-      }
-
-      if (listener != null) {
-        listener.applicationMigrationComplete();
-      }
-      break;
-    }
-  }
-
-  public static interface ApplicationMigrationListener {
-    public void applicationMigrationComplete();
-  }
-
-  private ServiceConnection serviceConnection = new ServiceConnection() {
-    public void onServiceConnected(ComponentName className, IBinder service) {
-      ApplicationMigrationService applicationMigrationService
-        = ((ApplicationMigrationService.ApplicationMigrationBinder)service).getService();
-
-      if (applicationMigrationService.isMigrating()) displayMigrationProgress();
-      else                                           displayMigrationPrompt();
-
-      applicationMigrationService.setHandler(ApplicationMigrationManager.this);
-    }
-
-    public void onServiceDisconnected(ComponentName name) {}
-  };
-
-}
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index ec0e1de785..2b224043d3 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.contacts.ContactIdentityManager;
 import org.thoughtcrime.securesms.crypto.IdentityKey;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
 import org.thoughtcrime.securesms.util.Trimmer;
@@ -138,7 +138,12 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
-    case android.R.id.home: finish(); return true;
+    case android.R.id.home:
+      Intent intent = new Intent(this, ConversationListActivity.class);
+      intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+      startActivity(intent);
+      finish();
+      return true;
     }
 
     return false;
@@ -313,9 +318,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
   private class ChangePassphraseClickListener implements Preference.OnPreferenceClickListener {
     @Override
     public boolean onPreferenceClick(Preference preference) {
-      SharedPreferences settings = getSharedPreferences(KeyCachingService.PREFERENCES_NAME, 0);
-
-      if (settings.getBoolean("passphrase_initialized", false)) {
+       if (MasterSecretUtil.isPassphraseInitialized(ApplicationPreferencesActivity.this)) {
         startActivity(new Intent(ApplicationPreferencesActivity.this, PassphraseChangeActivity.class));
       } else {
         Toast.makeText(ApplicationPreferencesActivity.this,
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index eb5404e4a3..94b4e84587 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -236,7 +236,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
     case R.id.menu_verify_recipient:     handleVerifyRecipient();                           return true;
     case R.id.menu_verify_session:       handleVerifySession();                             return true;
     case R.id.menu_group_recipients:     handleDisplayGroupRecipients();                    return true;
-    case android.R.id.home:              finish();                                          return true;
+    case android.R.id.home:              handleReturnToConversationList();                  return true;
     }
 
     return false;
@@ -261,6 +261,14 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
 
   //////// Event Handlers
 
+  private void handleReturnToConversationList() {
+    Intent intent = new Intent(this, ConversationListActivity.class);
+    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    intent.putExtra("master_secret", masterSecret);
+    startActivity(intent);
+    finish();
+  }
+
   private void handleVerifyRecipient() {
     Intent verifyIdentityIntent = new Intent(this, VerifyIdentityActivity.class);
     verifyIdentityIntent.putExtra("recipient", getRecipients().getPrimaryRecipient());
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 3f98b8d979..3f145ee8f4 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -1,25 +1,16 @@
 package org.thoughtcrime.securesms;
 
-import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.ContentObserver;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Parcelable;
 import android.provider.ContactsContract;
 import android.util.Log;
 import android.view.WindowManager;
 
 import org.thoughtcrime.securesms.ApplicationExportManager.ApplicationExportListener;
-import org.thoughtcrime.securesms.crypto.DecryptingQueue;
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
-import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.SendReceiveService;
@@ -36,11 +27,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
   private ConversationListFragment fragment;
   private MasterSecret masterSecret;
 
-  private ApplicationMigrationManager migrationManager;
-
-  private boolean havePromptedForPassphrase = false;
-  private boolean isVisible                 = false;
-
   @Override
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
@@ -52,32 +38,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
     initializeContactUpdatesReceiver();
   }
 
-  @Override
-  protected void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-    this.setIntent(intent);
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-
-    isVisible = true;
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-
-    isVisible = false;
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-    havePromptedForPassphrase = false;
-  }
-
   @Override
   public void onDestroy() {
     Log.w("ConversationListActivity", "onDestroy...");
@@ -87,47 +47,17 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
 
   @Override
   public void onMasterSecretCleared() {
-    this.masterSecret = null;
-    this.fragment.setMasterSecret(null);
-    this.invalidateOptionsMenu();
-
-    if (!havePromptedForPassphrase && isVisible) {
-      promptForPassphrase();
-    }
+//    this.fragment.setMasterSecret(null);
+    startActivity(new Intent(this, RoutingActivity.class));
+    super.onMasterSecretCleared();
   }
 
-  @Override
-  public void onNewMasterSecret(MasterSecret masterSecret) {
-    this.masterSecret = masterSecret;
-
-    if (masterSecret != null) {
-      if (!IdentityKeyUtil.hasIdentityKey(this)) {
-        new Thread(new IdentityKeyInitializer()).start();
-      }
-
-      if (!MasterSecretUtil.hasAsymmericMasterSecret(this)) {
-        new Thread(new AsymmetricMasteSecretInitializer()).start();
-      }
-
-      if (!isDatabaseMigrated()) initializeDatabaseMigration();
-      else                       DecryptingQueue.schedulePendingDecrypts(this, masterSecret);
-    }
-
-    this.fragment.setMasterSecret(masterSecret);
-    this.invalidateOptionsMenu();
-    this.havePromptedForPassphrase = false;
-    createConversationIfNecessary(this.getIntent());
-  }
-
-
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
-    Log.w("ConversationListActivity", "onPrepareOptionsMenu...");
     MenuInflater inflater = this.getSupportMenuInflater();
     menu.clear();
 
-    if (this.masterSecret == null) inflater.inflate(R.menu.text_secure_locked, menu);
-    else                           inflater.inflate(R.menu.text_secure_normal, menu);
+    inflater.inflate(R.menu.text_secure_normal, menu);
 
     super.onPrepareOptionsMenu(menu);
     return true;
@@ -138,12 +68,11 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
     super.onOptionsItemSelected(item);
 
     switch (item.getItemId()) {
-    case R.id.menu_new_message:      createConversation(-1, null, null, null, null); return true;
-    case R.id.menu_unlock:           promptForPassphrase();                          return true;
-    case R.id.menu_settings:         handleDisplaySettings();                        return true;
-    case R.id.menu_export:           handleExportDatabase();                         return true;
-    case R.id.menu_import:           handleImportDatabase();                         return true;
-    case R.id.menu_clear_passphrase: handleClearPassphrase();                        return true;
+    case R.id.menu_new_message:      createConversation(-1, null); return true;
+    case R.id.menu_settings:         handleDisplaySettings();      return true;
+    case R.id.menu_export:           handleExportDatabase();       return true;
+    case R.id.menu_import:           handleImportDatabase();       return true;
+    case R.id.menu_clear_passphrase: handleClearPassphrase();      return true;
     }
 
     return false;
@@ -151,39 +80,18 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
 
   @Override
   public void onCreateConversation(long threadId, Recipients recipients) {
-    createConversation(threadId, recipients, null, null, null);
+    createConversation(threadId, recipients);
   }
 
-  private void createConversation(long threadId, Recipients recipients,
-                                  String text, Uri imageUri, Uri audioUri)
-  {
-    if (this.masterSecret == null) {
-      promptForPassphrase();
-      return;
-    }
-
+  private void createConversation(long threadId, Recipients recipients) {
     Intent intent = new Intent(this, ConversationActivity.class);
     intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, recipients);
     intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
     intent.putExtra(ConversationActivity.MASTER_SECRET_EXTRA, masterSecret);
-    intent.putExtra(ConversationActivity.DRAFT_TEXT_EXTRA, text);
-    intent.putExtra(ConversationActivity.DRAFT_IMAGE_EXTRA, imageUri);
-    intent.putExtra(ConversationActivity.DRAFT_AUDIO_EXTRA, audioUri);
 
     startActivity(intent);
   }
 
-  private void promptForPassphrase() {
-    havePromptedForPassphrase = true;
-    if (hasSelectedPassphrase()) startActivity(new Intent(this, PassphrasePromptActivity.class));
-    else                         startActivity(new Intent(this, PassphraseCreateActivity.class));
-  }
-
-  private boolean hasSelectedPassphrase() {
-    SharedPreferences settings = getSharedPreferences(KeyCachingService.PREFERENCES_NAME, 0);
-    return settings.getBoolean("passphrase_initialized", false);
-  }
-
   private void handleDisplaySettings() {
     Intent preferencesIntent = new Intent(this, ApplicationPreferencesActivity.class);
     preferencesIntent.putExtra("master_secret", masterSecret);
@@ -237,89 +145,17 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
     startService(mmsSenderIntent);
   }
 
-  private void initializeDatabaseMigration() {
-    if (migrationManager == null) {
-      migrationManager = new ApplicationMigrationManager(this, masterSecret);
-
-      ApplicationMigrationManager.ApplicationMigrationListener listener =
-          new ApplicationMigrationManager.ApplicationMigrationListener() {
-            @Override
-            public void applicationMigrationComplete() {
-              if (masterSecret != null)
-                DecryptingQueue.schedulePendingDecrypts(ConversationListActivity.this,
-                                                        masterSecret);
-            }
-          };
-
-      migrationManager.setMigrationListener(listener);
-      migrationManager.migrate();
-    }
-  }
-
   private void initializeResources() {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
       getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
                            WindowManager.LayoutParams.FLAG_SECURE);
     }
 
+    this.masterSecret = (MasterSecret)getIntent().getParcelableExtra("master_secret");
+
     this.fragment = (ConversationListFragment)this.getSupportFragmentManager()
         .findFragmentById(R.id.fragment_content);
-  }
 
-  private boolean isDatabaseMigrated() {
-    return this.getSharedPreferences("SecureSMS", Context.MODE_PRIVATE)
-            .getBoolean("migrated", false);
-  }
-
-  private void createConversationIfNecessary(Intent intent) {
-    long thread           = intent.getLongExtra("thread_id", -1L);
-    String type           = intent.getType();
-    Recipients recipients = null;
-    String draftText      = null;
-    Uri draftImage        = null;
-    Uri draftAudio        = null;
-
-    if (Intent.ACTION_SENDTO.equals(intent.getAction())) {
-      try {
-        recipients = RecipientFactory.getRecipientsFromString(this, intent.getData().getSchemeSpecificPart(), false);
-        thread     = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipients);
-      } catch (RecipientFormattingException rfe) {
-        recipients = null;
-      }
-    } else if (Intent.ACTION_SEND.equals(intent.getAction())) {
-      if ("text/plain".equals(type)) {
-        draftText = intent.getStringExtra(Intent.EXTRA_TEXT);
-      } else if (type.startsWith("image/")) {
-        draftImage = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-      } else if (type.startsWith("audio/")) {
-        draftAudio = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-      }
-    } else {
-      recipients = intent.getParcelableExtra("recipients");
-    }
-
-    if (recipients != null || Intent.ACTION_SEND.equals(intent.getAction())) {
-      createConversation(thread, recipients, draftText, draftImage, draftAudio);
-
-      intent.putExtra("thread_id", -1L);
-      intent.putExtra("recipients", (Parcelable)null);
-      intent.putExtra(Intent.EXTRA_TEXT, (String)null);
-      intent.putExtra(Intent.EXTRA_STREAM, (Parcelable)null);
-      intent.setAction(null);
-    }
-  }
-
-  private class IdentityKeyInitializer implements Runnable {
-    @Override
-    public void run() {
-      IdentityKeyUtil.generateIdentityKeys(ConversationListActivity.this, masterSecret);
-    }
-  }
-
-  private class AsymmetricMasteSecretInitializer implements Runnable {
-    @Override
-    public void run() {
-      MasterSecretUtil.generateAsymmetricMasterSecret(ConversationListActivity.this, masterSecret);
-    }
+    this.fragment.setMasterSecret(masterSecret);
   }
 }
diff --git a/src/org/thoughtcrime/securesms/DatabaseMigrationActivity.java b/src/org/thoughtcrime/securesms/DatabaseMigrationActivity.java
new file mode 100644
index 0000000000..ce58f57e1e
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/DatabaseMigrationActivity.java
@@ -0,0 +1,189 @@
+package org.thoughtcrime.securesms;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
+import org.thoughtcrime.securesms.service.ApplicationMigrationService;
+import org.thoughtcrime.securesms.service.ApplicationMigrationService.ImportState;
+
+public class DatabaseMigrationActivity extends PassphraseRequiredSherlockActivity {
+
+  private final ImportServiceConnection serviceConnection  = new ImportServiceConnection();
+  private final ImportStateHandler      importStateHandler = new ImportStateHandler();
+  private final BroadcastReceiver       completedReceiver  = new NullReceiver();
+
+  private LinearLayout promptLayout;
+  private LinearLayout progressLayout;
+  private Button       skipButton;
+  private Button       importButton;
+  private ProgressBar  progress;
+  private TextView     progressLabel;
+
+  private ApplicationMigrationService importService;
+  private boolean isVisible = false;
+
+  @Override
+  public void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+    setContentView(R.layout.database_migration_activity);
+
+    initializeResources();
+    initializeServiceBinding();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    isVisible = true;
+    registerForCompletedNotification();
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    isVisible = false;
+    unregisterForCompletedNotification();
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    shutdownServiceBinding();
+  }
+
+  private void initializeServiceBinding() {
+    Intent intent = new Intent(this, ApplicationMigrationService.class);
+    bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
+  }
+
+  private void initializeResources() {
+    this.promptLayout   = (LinearLayout)findViewById(R.id.prompt_layout);
+    this.progressLayout = (LinearLayout)findViewById(R.id.progress_layout);
+    this.skipButton     = (Button)      findViewById(R.id.skip_button);
+    this.importButton   = (Button)      findViewById(R.id.import_button);
+    this.progress       = (ProgressBar) findViewById(R.id.import_progress);
+    this.progressLabel  = (TextView)    findViewById(R.id.import_status);
+
+    this.progressLayout.setVisibility(View.GONE);
+    this.promptLayout.setVisibility(View.GONE);
+
+    this.importButton.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        Intent intent = new Intent(DatabaseMigrationActivity.this, ApplicationMigrationService.class);
+        intent.setAction(ApplicationMigrationService.MIGRATE_DATABASE);
+        intent.putExtra("master_secret", getIntent().getParcelableExtra("master_secret"));
+        startService(intent);
+
+        promptLayout.setVisibility(View.GONE);
+        progressLayout.setVisibility(View.VISIBLE);
+      }
+    });
+
+    this.skipButton.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        ApplicationMigrationService.setDatabaseImported(DatabaseMigrationActivity.this);
+        handleImportComplete();
+      }
+    });
+  }
+
+  private void registerForCompletedNotification() {
+    IntentFilter filter = new IntentFilter();
+    filter.addAction(ApplicationMigrationService.COMPLETED_ACTION);
+    filter.setPriority(1000);
+
+    registerReceiver(completedReceiver, filter);
+  }
+
+  private void unregisterForCompletedNotification() {
+    unregisterReceiver(completedReceiver);
+  }
+
+  private void shutdownServiceBinding() {
+    unbindService(serviceConnection);
+  }
+
+  private void handleStateIdle() {
+    this.promptLayout.setVisibility(View.VISIBLE);
+    this.progressLayout.setVisibility(View.GONE);
+  }
+
+  private void handleStateProgress(ProgressDescription update) {
+    this.promptLayout.setVisibility(View.GONE);
+    this.progressLayout.setVisibility(View.VISIBLE);
+    this.progressLabel.setText(update.primaryComplete + "/" + update.primaryTotal);
+
+    double max               = this.progress.getMax();
+    double primaryTotal      = update.primaryTotal;
+    double primaryComplete   = update.primaryComplete;
+    double secondaryTotal    = update.secondaryTotal;
+    double secondaryComplete = update.secondaryComplete;
+
+    this.progress.setProgress((int)Math.round((primaryComplete / primaryTotal) * max));
+    this.progress.setSecondaryProgress((int)Math.round((secondaryComplete / secondaryTotal) * max));
+  }
+
+  private void handleImportComplete() {
+    if (isVisible) {
+      if (getIntent().hasExtra("next_intent")) {
+        startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
+      } else {
+        startActivity(new Intent(this, ConversationListActivity.class));
+      }
+    }
+
+    finish();
+  }
+
+  private class ImportStateHandler extends Handler {
+    @Override
+    public void handleMessage(Message message) {
+      switch (message.what) {
+      case ImportState.STATE_IDLE:                   handleStateIdle();                                     break;
+      case ImportState.STATE_MIGRATING_IN_PROGRESS:  handleStateProgress((ProgressDescription)message.obj); break;
+      case ImportState.STATE_MIGRATING_COMPLETE:     handleImportComplete();                                break;
+      }
+    }
+  }
+
+  private class ImportServiceConnection implements ServiceConnection {
+    @Override
+    public void onServiceConnected(ComponentName className, IBinder service) {
+      importService  = ((ApplicationMigrationService.ApplicationMigrationBinder)service).getService();
+      importService.setImportStateHandler(importStateHandler);
+
+      ImportState state = importService.getState();
+      importStateHandler.obtainMessage(state.state, state.progress).sendToTarget();
+    }
+
+    @Override
+    public void onServiceDisconnected(ComponentName name) {
+      importService.setImportStateHandler(null);
+    }
+  }
+
+  private class NullReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      abortBroadcast();
+    }
+  }
+
+
+}
diff --git a/src/org/thoughtcrime/securesms/PassphraseActivity.java b/src/org/thoughtcrime/securesms/PassphraseActivity.java
index 03b979b34a..c3ffa72285 100644
--- a/src/org/thoughtcrime/securesms/PassphraseActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseActivity.java
@@ -22,12 +22,12 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
 
-import com.actionbarsherlock.app.SherlockActivity;
-
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
 
+import com.actionbarsherlock.app.SherlockActivity;
+
 /**
  * Base Activity for changing/prompting local encryption passphrase.
  *
@@ -44,9 +44,14 @@ public abstract class PassphraseActivity extends SherlockActivity {
     bindService(bindIntent, serviceConnection, Context.BIND_AUTO_CREATE);
   }
 
+  protected MasterSecret getMasterSecret() {
+    return masterSecret;
+  }
+
   protected abstract void cleanup();
 
   private ServiceConnection serviceConnection = new ServiceConnection() {
+      @Override
       public void onServiceConnected(ComponentName className, IBinder service) {
         keyCachingService = ((KeyCachingService.KeyCachingBinder)service).getService();
         keyCachingService.setMasterSecret(masterSecret);
@@ -55,9 +60,12 @@ public abstract class PassphraseActivity extends SherlockActivity {
 
         MemoryCleaner.clean(masterSecret);
         cleanup();
+
+        PassphraseActivity.this.setResult(RESULT_OK);
         PassphraseActivity.this.finish();
       }
 
+      @Override
       public void onServiceDisconnected(ComponentName name) {
         keyCachingService = null;
       }
diff --git a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
index 37d818def6..e86573bad1 100644
--- a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
@@ -16,18 +16,19 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.app.ProgressDialog;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
+import org.thoughtcrime.securesms.util.Util;
 
 /**
  * Activity for creating a user's local encryption passphrase.
@@ -37,10 +38,12 @@ import org.thoughtcrime.securesms.util.MemoryCleaner;
 
 public class PassphraseCreateActivity extends PassphraseActivity {
 
+  private LinearLayout createLayout;
+  private LinearLayout progressLayout;
+
   private EditText passphraseEdit;
   private EditText passphraseRepeatEdit;
   private Button   okButton;
-  private Button   cancelButton;
 
   public PassphraseCreateActivity() { }
 
@@ -54,10 +57,11 @@ public class PassphraseCreateActivity extends PassphraseActivity {
   }
 
   private void initializeResources() {
-    this.passphraseEdit       = (EditText) findViewById(R.id.passphrase_edit);
-    this.passphraseRepeatEdit = (EditText) findViewById(R.id.passphrase_edit_repeat);
-    this.okButton             = (Button)   findViewById(R.id.ok_button);
-    this.cancelButton         = (Button)   findViewById(R.id.cancel_button);
+    this.createLayout         = (LinearLayout)findViewById(R.id.create_layout);
+    this.progressLayout       = (LinearLayout)findViewById(R.id.progress_layout);
+    this.passphraseEdit       = (EditText)    findViewById(R.id.passphrase_edit);
+    this.passphraseRepeatEdit = (EditText)    findViewById(R.id.passphrase_edit_repeat);
+    this.okButton             = (Button)      findViewById(R.id.ok_button);
 
     this.okButton.setOnClickListener(new View.OnClickListener() {
       @Override
@@ -65,45 +69,36 @@ public class PassphraseCreateActivity extends PassphraseActivity {
         verifyAndSavePassphrases();
       }
     });
-
-    this.cancelButton.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        finish();
-      }
-    });
   }
 
   private void verifyAndSavePassphrases() {
+    if (Util.isEmpty(this.passphraseEdit) || Util.isEmpty(this.passphraseRepeatEdit)) {
+      Toast.makeText(this, R.string.PassphraseCreateActivity_you_must_specify_a_password, Toast.LENGTH_SHORT).show();
+      return;
+    }
+
     String passphrase       = this.passphraseEdit.getText().toString();
     String passphraseRepeat = this.passphraseRepeatEdit.getText().toString();
 
     if (!passphrase.equals(passphraseRepeat)) {
-      Toast.makeText(getApplicationContext(),
-                     R.string.PassphraseCreateActivity_passphrases_dont_match_exclamation,
-                     Toast.LENGTH_SHORT).show();
+      Toast.makeText(this, R.string.PassphraseCreateActivity_passphrases_dont_match, Toast.LENGTH_SHORT).show();
       this.passphraseEdit.setText("");
       this.passphraseRepeatEdit.setText("");
-    } else {
-      // We do this, but the edit boxes are basically impossible to clean up.
-      MemoryCleaner.clean(passphraseRepeat);
-      new SecretGenerator().execute(passphrase);
+      return;
     }
+
+    // We do this, but the edit boxes are basically impossible to clean up.
+    MemoryCleaner.clean(passphraseRepeat);
+    new SecretGenerator().execute(passphrase);
   }
 
   private class SecretGenerator extends AsyncTask<String, Void, Void> {
-    private ProgressDialog progressDialog;
     private MasterSecret   masterSecret;
 
     @Override
     protected void onPreExecute() {
-      progressDialog = new ProgressDialog(PassphraseCreateActivity.this);
-      progressDialog.setTitle(R.string.PassphraseCreateActivity_generating_keypair);
-      progressDialog.setMessage(getString(R.string.PassphraseCreateActivity_generating_a_local_encryption_keypair));
-      progressDialog.setCancelable(false);
-      progressDialog.setIndeterminate(true);
-      progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-      progressDialog.show();
+      createLayout.setVisibility(View.GONE);
+      progressLayout.setVisibility(View.VISIBLE);
     }
 
     @Override
@@ -123,7 +118,6 @@ public class PassphraseCreateActivity extends PassphraseActivity {
 
     @Override
     protected void onPostExecute(Void param) {
-      progressDialog.dismiss();
       setMasterSecret(masterSecret);
     }
   }
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index 714a045ba8..d8e40e9067 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -38,7 +38,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
   private EditText passphraseText;
   private Button okButton;
-  private Button cancelButton;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -51,13 +50,12 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private void initializeResources() {
     passphraseText = (EditText)findViewById(R.id.passphrase_edit);
     okButton       = (Button)findViewById(R.id.ok_button);
-    cancelButton   = (Button)findViewById(R.id.cancel_button);
 
     okButton.setOnClickListener(new OkButtonClickListener());
-    cancelButton.setOnClickListener(new CancelButtonClickListener());
   }
 
   private class OkButtonClickListener implements OnClickListener {
+    @Override
     public void onClick(View v) {
       try {
         Editable text             = passphraseText.getText();
@@ -74,16 +72,9 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     }
   }
 
-  private class CancelButtonClickListener implements OnClickListener {
-    public void onClick(View v) {
-      finish();
-    }
-  }
-
   @Override
   protected void cleanup() {
     this.passphraseText = null;
     System.gc();
   }
-
 }
diff --git a/src/org/thoughtcrime/securesms/RoutingActivity.java b/src/org/thoughtcrime/securesms/RoutingActivity.java
new file mode 100644
index 0000000000..dedfaea7e5
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/RoutingActivity.java
@@ -0,0 +1,218 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Intent;
+import android.net.Uri;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.recipients.RecipientFactory;
+import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
+import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.service.ApplicationMigrationService;
+
+public class RoutingActivity extends PassphraseRequiredSherlockActivity {
+
+  private static final int STATE_CREATE_PASSPHRASE    = 1;
+  private static final int STATE_PROMPT_PASSPHRASE    = 2;
+  private static final int STATE_IMPORT_DATABASE      = 3;
+  private static final int STATE_CONVERSATION_OR_LIST = 4;
+
+  private MasterSecret masterSecret = null;
+  private boolean      isVisible    = false;
+
+  @Override
+  public void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    setIntent(intent);
+  }
+
+  @Override
+  public void onResume() {
+    this.isVisible = true;
+    super.onResume();
+  }
+
+  @Override
+  public void onPause() {
+    this.isVisible = false;
+    super.onPause();
+  }
+
+  @Override
+  public void onNewMasterSecret(MasterSecret masterSecret) {
+    this.masterSecret = masterSecret;
+
+    if (isVisible) {
+      routeApplicationState();
+    }
+  }
+
+  @Override
+  public void onMasterSecretCleared() {
+    this.masterSecret = null;
+
+    if (isVisible) {
+      routeApplicationState();
+    }
+  }
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (resultCode == RESULT_CANCELED)
+      finish();
+  }
+
+  private void routeApplicationState() {
+    int state = getApplicationState();
+
+    switch (state) {
+    case STATE_CREATE_PASSPHRASE:    handleCreatePassphrase();          break;
+    case STATE_PROMPT_PASSPHRASE:    handlePromptPassphrase();          break;
+    case STATE_IMPORT_DATABASE:      handleImportDatabase();            break;
+    case STATE_CONVERSATION_OR_LIST: handleDisplayConversationOrList(); break;
+    }
+  }
+
+  private void handleCreatePassphrase() {
+    Intent intent = new Intent(this, PassphraseCreateActivity.class);
+    startActivityForResult(intent, 1);
+  }
+
+  private void handlePromptPassphrase() {
+    Intent intent = new Intent(this, PassphrasePromptActivity.class);
+    startActivityForResult(intent, 2);
+  }
+
+  private void handleImportDatabase() {
+    Intent intent = new Intent(this, DatabaseMigrationActivity.class);
+    intent.putExtra("master_secret", masterSecret);
+    intent.putExtra("next_intent", getConversationListIntent());
+
+    startActivity(intent);
+    finish();
+  }
+
+  private void handleDisplayConversationOrList() {
+    ConversationParameters parameters = getConversationParameters();
+
+    Intent intent;
+
+    if (isShareAction() || parameters.recipients != null) {
+      intent = getConversationIntent(parameters);
+    } else {
+      intent = getConversationListIntent();
+    }
+
+    startActivity(intent);
+    finish();
+  }
+
+  private Intent getConversationIntent(ConversationParameters parameters) {
+    Intent intent = new Intent(this, ConversationActivity.class);
+    intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, parameters.recipients);
+    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, parameters.thread);
+    intent.putExtra(ConversationActivity.MASTER_SECRET_EXTRA, masterSecret);
+    intent.putExtra(ConversationActivity.DRAFT_TEXT_EXTRA, parameters.draftText);
+    intent.putExtra(ConversationActivity.DRAFT_IMAGE_EXTRA, parameters.draftImage);
+    intent.putExtra(ConversationActivity.DRAFT_AUDIO_EXTRA, parameters.draftAudio);
+
+    return intent;
+  }
+
+  private Intent getConversationListIntent() {
+    Intent intent = new Intent(this, ConversationListActivity.class);
+    intent.putExtra("master_secret", masterSecret);
+
+    return intent;
+  }
+
+  private int getApplicationState() {
+    if (!MasterSecretUtil.isPassphraseInitialized(this))
+      return STATE_CREATE_PASSPHRASE;
+
+    if (masterSecret == null)
+      return STATE_PROMPT_PASSPHRASE;
+
+    if (!ApplicationMigrationService.isDatabaseImported(this))
+      return STATE_IMPORT_DATABASE;
+
+    return STATE_CONVERSATION_OR_LIST;
+  }
+
+  private ConversationParameters getConversationParameters() {
+    if (isSendAction()) {
+      return getConversationParametersForSendAction();
+    } else if (isShareAction()) {
+      return getConversationParametersForShareAction();
+    } else {
+      return getConversationParametersForInternalAction();
+    }
+  }
+
+  private ConversationParameters getConversationParametersForSendAction() {
+    Recipients recipients = null;
+    long       threadId   = getIntent().getLongExtra("thread_id", -1);
+
+    try {
+      String data = getIntent().getData().getSchemeSpecificPart();
+      recipients = RecipientFactory.getRecipientsFromString(this, data, false);
+      threadId   = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipients);
+    } catch (RecipientFormattingException rfe) {
+      recipients = null;
+    }
+
+    return new ConversationParameters(threadId, recipients, null, null, null);
+  }
+
+  private ConversationParameters getConversationParametersForShareAction() {
+    String type      = getIntent().getType();
+    String draftText = null;
+    Uri draftImage   = null;
+    Uri draftAudio   = null;
+
+    if ("text/plain".equals(type)) {
+      draftText = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+    } else if (type.startsWith("image/")) {
+      draftImage = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+    } else if (type.startsWith("audio/")) {
+      draftAudio = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+    }
+
+    return new ConversationParameters(-1, null, draftText, draftImage, draftAudio);
+  }
+
+  private ConversationParameters getConversationParametersForInternalAction() {
+    long threadId         = getIntent().getLongExtra("thread_id", -1);
+    Recipients recipients = getIntent().getParcelableExtra("recipients");
+
+    return new ConversationParameters(threadId, recipients, null, null, null);
+  }
+
+  private boolean isShareAction() {
+    return Intent.ACTION_SEND.equals(getIntent().getAction());
+  }
+
+  private boolean isSendAction() {
+    return Intent.ACTION_SENDTO.equals(getIntent().getAction());
+  }
+
+  private static class ConversationParameters {
+    public final long       thread;
+    public final Recipients recipients;
+    public final String     draftText;
+    public final Uri        draftImage;
+    public final Uri        draftAudio;
+
+    public ConversationParameters(long thread, Recipients recipients,
+                                  String draftText, Uri draftImage, Uri draftAudio)
+    {
+     this.thread     = thread;
+     this.recipients = recipients;
+     this.draftText  = draftText;
+     this.draftImage = draftImage;
+     this.draftAudio = draftAudio;
+    }
+  }
+
+}
diff --git a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java b/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
index 4718ad1111..4b84e7ef2e 100644
--- a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
+++ b/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.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,12 +10,21 @@
  * 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 android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.util.Log;
+
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.thoughtcrime.securesms.util.Base64;
+
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
@@ -31,38 +40,29 @@ import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.PBEParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.thoughtcrime.securesms.util.Base64;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.util.Log;
-
 /**
  * Helper class for generating and securely storing a MasterSecret.
- * 
+ *
  * @author Moxie Marlinspike
  */
 
 public class MasterSecretUtil {
-	
+
   public static final String PREFERENCES_NAME        = "SecureSMS-Preferences";
   public static final String ASYMMETRIC_LOCAL_PUBLIC = "asymmetric_master_secret_public";
-	
+
   public static MasterSecret changeMasterSecretPassphrase(Context context, String originalPassphrase, String newPassphrase) throws InvalidPassphraseException {
     try {
       MasterSecret masterSecret    = getMasterSecret(context, originalPassphrase);
       byte[] combinedSecrets       = combineSecrets(masterSecret.getEncryptionKey().getEncoded(), masterSecret.getMacKey().getEncoded());
       encryptWithPassphraseAndSave(context, combinedSecrets, newPassphrase);
-			
+
       return masterSecret;
     } catch (GeneralSecurityException gse) {
       throw new AssertionError(gse);
     }
   }
-	
+
   public static MasterSecret getMasterSecret(Context context, String passphrase) throws InvalidPassphraseException {
     try {
       byte[] encryptedAndMacdMasterSecret = retrieve(context, "master_secret");
@@ -70,7 +70,7 @@ public class MasterSecretUtil {
       byte[] combinedSecrets              = decryptWithPassphrase(context, encryptedMasterSecret, passphrase);
       byte[] encryptionSecret             = getEncryptionSecret(combinedSecrets);
       byte[] macSecret                    = getMacSecret(combinedSecrets);
-			
+
       return new MasterSecret(new SecretKeySpec(encryptionSecret, "AES"),
 			      new SecretKeySpec(macSecret, "HmacSHA1"));
     } catch (GeneralSecurityException e) {
@@ -80,18 +80,18 @@ public class MasterSecretUtil {
       Log.w("keyutil", e);
       return null; //XXX
     }
-  }	
-	
+  }
+
   public static AsymmetricMasterSecret getAsymmetricMasterSecret(Context context, MasterSecret masterSecret) {
     try {
       PublicKey publicKey               = new PublicKey(retrieve(context, ASYMMETRIC_LOCAL_PUBLIC));
       ECPrivateKeyParameters privateKey = null;
-			
+
       if (masterSecret != null) {
         MasterCipher masterCipher = new MasterCipher(masterSecret);
         privateKey                = masterCipher.decryptKey(retrieve(context, "asymmetric_master_secret_private"));
       }
-			
+
       return new AsymmetricMasterSecret(publicKey, privateKey);
     } catch (InvalidKeyException ike) {
       throw new AssertionError(ike);
@@ -99,93 +99,98 @@ public class MasterSecretUtil {
       throw new AssertionError(e);
     }
   }
-	
+
   public static AsymmetricMasterSecret generateAsymmetricMasterSecret(Context context, MasterSecret masterSecret) {
-    MasterCipher masterCipher         = new MasterCipher(masterSecret);			
+    MasterCipher masterCipher         = new MasterCipher(masterSecret);
     AsymmetricCipherKeyPair ackp      = KeyUtil.generateKeyPair();
     KeyPair keyPair                   = new KeyPair(31337, ackp, masterSecret);
     PublicKey publicKey               = keyPair.getPublicKey();
     ECPrivateKeyParameters privateKey = (ECPrivateKeyParameters)ackp.getPrivate();
-		
+
     save(context, ASYMMETRIC_LOCAL_PUBLIC, publicKey.serialize());
     save(context, "asymmetric_master_secret_private", masterCipher.encryptKey(privateKey));
-		
+
     return new AsymmetricMasterSecret(publicKey, privateKey);
   }
-	
+
   public static MasterSecret generateMasterSecret(Context context, String passphrase) {
     try {
       byte[] encryptionSecret             = generateEncryptionSecret();
       byte[] macSecret                    = generateMacSecret();
       byte[] masterSecret                 = combineSecrets(encryptionSecret, macSecret);
-			
+
       encryptWithPassphraseAndSave(context, masterSecret, passphrase);
-			
-      return new MasterSecret(new SecretKeySpec(encryptionSecret, "AES"), 
+
+      return new MasterSecret(new SecretKeySpec(encryptionSecret, "AES"),
 			      new SecretKeySpec(macSecret, "HmacSHA1"));
     } catch (GeneralSecurityException e) {
       Log.w("keyutil", e);
       return null;
     }
   }
-	
+
   public static boolean hasAsymmericMasterSecret(Context context) {
     SharedPreferences settings = context.getSharedPreferences(PREFERENCES_NAME, 0);
-    return settings.contains(ASYMMETRIC_LOCAL_PUBLIC);		
+    return settings.contains(ASYMMETRIC_LOCAL_PUBLIC);
   }
-	
+
+  public static boolean isPassphraseInitialized(Context context) {
+    SharedPreferences preferences = context.getSharedPreferences(PREFERENCES_NAME, 0);
+    return preferences.getBoolean("passphrase_initialized", false);
+  }
+
   private static void encryptWithPassphraseAndSave(Context context, byte[] masterSecret, String passphrase) throws GeneralSecurityException {
     byte[] encryptedMasterSecret        = encryptWithPassphrase(context, masterSecret, passphrase);
     byte[] encryptedAndMacdMasterSecret = macWithPassphrase(context, encryptedMasterSecret, passphrase);
-		
+
     save(context, "master_secret", encryptedAndMacdMasterSecret);
-    save(context, "passphrase_initialized", true);		
+    save(context, "passphrase_initialized", true);
   }
-	
+
   private static byte[] getEncryptionSecret(byte[] combinedSecrets) {
     byte[] encryptionSecret = new byte[16];
     System.arraycopy(combinedSecrets, 0, encryptionSecret, 0, encryptionSecret.length);
     return encryptionSecret;
   }
-	
+
   private static byte[] getMacSecret(byte[] combinedSecrets) {
     byte[] macSecret = new byte[20];
     System.arraycopy(combinedSecrets, 16, macSecret, 0, macSecret.length);
     return macSecret;
   }
-	
+
   private static byte[] combineSecrets(byte[] encryptionSecret, byte[] macSecret) {
     byte[] combinedSecret = new byte[encryptionSecret.length + macSecret.length];
     System.arraycopy(encryptionSecret, 0, combinedSecret, 0, encryptionSecret.length);
     System.arraycopy(macSecret, 0, combinedSecret, encryptionSecret.length, macSecret.length);
-		
+
     return combinedSecret;
   }
-	
+
   private static void save(Context context, String key, byte[] value) {
     SharedPreferences settings = context.getSharedPreferences(PREFERENCES_NAME, 0);
     Editor editor              = settings.edit();
-		
+
     editor.putString(key, Base64.encodeBytes(value));
-    editor.commit();		
+    editor.commit();
   }
-	
+
   private static void save(Context context, String key, boolean value) {
     SharedPreferences settings = context.getSharedPreferences(PREFERENCES_NAME, 0);
     Editor editor              = settings.edit();
-		
+
     editor.putBoolean(key, value);
-    editor.commit();				
+    editor.commit();
   }
-	
+
   private static byte[] retrieve(Context context, String key) throws IOException {
     SharedPreferences settings = context.getSharedPreferences(PREFERENCES_NAME, 0);
     String encodedValue        = settings.getString(key, "");
-		
+
     if (encodedValue == "") return null;
     else                    return Base64.decode(encodedValue);
   }
-	
+
   private static byte[] generateEncryptionSecret() {
     try {
       KeyGenerator generator = KeyGenerator.getInstance("AES");
@@ -196,9 +201,9 @@ public class MasterSecretUtil {
     } catch (NoSuchAlgorithmException ex) {
       Log.w("keyutil", ex);
       return null;
-    }		
+    }
   }
-	
+
   private static byte[] generateMacSecret() {
     try {
       KeyGenerator generator = KeyGenerator.getInstance("HmacSHA1");
@@ -208,42 +213,42 @@ public class MasterSecretUtil {
       return null;
     }
   }
-	
+
   private static byte[] generateSalt() throws NoSuchAlgorithmException {
     SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
     byte[] salt         = new byte[8];
     random.nextBytes(salt);
-	    
+
     return salt;
   }
-		
+
   private static SecretKey getKeyFromPassphrase(String passphrase, byte[] salt) throws GeneralSecurityException {
     PBEKeySpec keyspec    = new PBEKeySpec(passphrase.toCharArray(), salt, 100);
     SecretKeyFactory skf  = SecretKeyFactory.getInstance("PBEWITHSHA1AND128BITAES-CBC-BC");
     return skf.generateSecret(keyspec);
   }
-	
-  private static Cipher getCipherFromPassphrase(String passphrase, byte[] salt, int opMode) throws GeneralSecurityException {		
+
+  private static Cipher getCipherFromPassphrase(String passphrase, byte[] salt, int opMode) throws GeneralSecurityException {
     SecretKey key              = getKeyFromPassphrase(passphrase, salt);
     Cipher cipher              = Cipher.getInstance(key.getAlgorithm());
     cipher.init(opMode, key, new PBEParameterSpec(salt, 100));
-		
+
     return cipher;
   }
-	
+
   private static byte[] encryptWithPassphrase(Context context, byte[] data, String passphrase) throws NoSuchAlgorithmException, GeneralSecurityException {
-    byte[] encryptionSalt = generateSalt();		
+    byte[] encryptionSalt = generateSalt();
     Cipher cipher         = getCipherFromPassphrase(passphrase, encryptionSalt, Cipher.ENCRYPT_MODE);
     byte[] cipherText     = cipher.doFinal(data);
-		
-    save(context, "encryption_salt", encryptionSalt);       
+
+    save(context, "encryption_salt", encryptionSalt);
     return cipherText;
   }
-	
+
   private static byte[] decryptWithPassphrase(Context context, byte[] data, String passphrase) throws GeneralSecurityException, IOException {
     byte[] encryptionSalt = retrieve(context, "encryption_salt");
     Cipher cipher         = getCipherFromPassphrase(passphrase, encryptionSalt, Cipher.DECRYPT_MODE);
-    return cipher.doFinal(data);		
+    return cipher.doFinal(data);
   }
 
   private static Mac getMacForPassphrase(String passphrase, byte[] salt) throws GeneralSecurityException {
@@ -255,32 +260,32 @@ public class MasterSecretUtil {
 
     return hmac;
   }
-	
+
   private static byte[] verifyMac(Context context, byte[] encryptedAndMacdData, String passphrase) throws InvalidPassphraseException, GeneralSecurityException, IOException {
     byte[] macSalt  = retrieve(context, "mac_salt");
-    Mac hmac        = getMacForPassphrase(passphrase, macSalt);		
+    Mac hmac        = getMacForPassphrase(passphrase, macSalt);
 
     byte[] encryptedData = new byte[encryptedAndMacdData.length - hmac.getMacLength()];
     System.arraycopy(encryptedAndMacdData, 0, encryptedData, 0, encryptedData.length);
-		
+
     byte[] givenMac      = new byte[hmac.getMacLength()];
     System.arraycopy(encryptedAndMacdData, encryptedAndMacdData.length-hmac.getMacLength(), givenMac, 0, givenMac.length);
 
     byte[] localMac      = hmac.doFinal(encryptedData);
-		
+
     if (Arrays.equals(givenMac, localMac)) return encryptedData;
-    else                                   throw new InvalidPassphraseException("MAC Error");		
+    else                                   throw new InvalidPassphraseException("MAC Error");
   }
-	
+
   private static byte[] macWithPassphrase(Context context, byte[] data, String passphrase) throws GeneralSecurityException {
-    byte[] macSalt = generateSalt();				
+    byte[] macSalt = generateSalt();
     Mac hmac       = getMacForPassphrase(passphrase, macSalt);
     byte[] mac     = hmac.doFinal(data);
     byte[] result  = new byte[data.length + mac.length];
-        
+
     System.arraycopy(data, 0, result, 0, data.length);
     System.arraycopy(mac,  0, result, data.length, mac.length);
-        
+
     save(context, "mac_salt", macSalt);
     return result;
   }
diff --git a/src/org/thoughtcrime/securesms/database/SmsMigrator.java b/src/org/thoughtcrime/securesms/database/SmsMigrator.java
index 92152b9531..86209f17df 100644
--- a/src/org/thoughtcrime/securesms/database/SmsMigrator.java
+++ b/src/org/thoughtcrime/securesms/database/SmsMigrator.java
@@ -150,7 +150,7 @@ public class SmsMigrator {
 
   private static void migrateConversation(Context context, MasterSecret masterSecret,
                                           SmsMigrationProgressListener listener,
-                                          int primaryProgress,
+                                          ProgressDescription progress,
                                           long theirThreadId, long ourThreadId)
   {
     SmsDatabase ourSmsDatabase = DatabaseFactory.getSmsDatabase(context);
@@ -166,11 +166,7 @@ public class SmsMigrator {
         getContentValuesForRow(context, masterSecret, cursor, ourThreadId, statement);
         statement.execute();
 
-        double position = cursor.getPosition();
-        double count    = cursor.getCount();
-        double progress = position / count;
-
-        listener.progressUpdate(primaryProgress, (int)(progress * 10000));
+        listener.progressUpdate(new ProgressDescription(progress, cursor.getCount(), cursor.getPosition()));
       }
 
       ourSmsDatabase.endTransaction(transaction);
@@ -192,31 +188,26 @@ public class SmsMigrator {
 
     ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(context);
     Cursor cursor                 = null;
-    int primaryProgress           = 0;
 
     try {
       Uri threadListUri = Uri.parse("content://mms-sms/conversations?simple=true");
       cursor            = context.getContentResolver().query(threadListUri, null, null, null, "date ASC");
 
       while (cursor != null && cursor.moveToNext()) {
-        long   theirThreadId     = cursor.getLong(cursor.getColumnIndexOrThrow("_id"));
-        String theirRecipients   = cursor.getString(cursor.getColumnIndexOrThrow("recipient_ids"));
-        Recipients ourRecipients = getOurRecipients(context, theirRecipients);
+        long   theirThreadId         = cursor.getLong(cursor.getColumnIndexOrThrow("_id"));
+        String theirRecipients       = cursor.getString(cursor.getColumnIndexOrThrow("recipient_ids"));
+        Recipients ourRecipients     = getOurRecipients(context, theirRecipients);
+        ProgressDescription progress = new ProgressDescription(cursor.getCount(), cursor.getPosition(), 100, 0);
 
         if (ourRecipients != null) {
           long ourThreadId = threadDatabase.getThreadIdFor(ourRecipients);
           migrateConversation(context, masterSecret,
-                              listener, primaryProgress,
+                              listener, progress,
                               theirThreadId, ourThreadId);
         }
 
-        double position = cursor.getPosition() + 1;
-        double count    = cursor.getCount();
-        double progress = position / count;
-
-        primaryProgress = (int)(progress * 10000);
-
-        listener.progressUpdate(primaryProgress, 0);
+        progress.incrementPrimaryComplete();
+        listener.progressUpdate(progress);
       }
     } finally {
       if (cursor != null)
@@ -228,6 +219,34 @@ public class SmsMigrator {
   }
 
   public interface SmsMigrationProgressListener {
-    public void progressUpdate(int primaryProgress, int secondaryProgress);
+    public void progressUpdate(ProgressDescription description);
   }
+
+  public static class ProgressDescription {
+    public final int primaryTotal;
+    public       int primaryComplete;
+    public final int secondaryTotal;
+    public final int secondaryComplete;
+
+    public ProgressDescription(int primaryTotal, int primaryComplete,
+                               int secondaryTotal, int secondaryComplete)
+    {
+      this.primaryTotal      = primaryTotal;
+      this.primaryComplete   = primaryComplete;
+      this.secondaryTotal    = secondaryTotal;
+      this.secondaryComplete = secondaryComplete;
+    }
+
+    public ProgressDescription(ProgressDescription that, int secondaryTotal, int secondaryComplete) {
+      this.primaryComplete   = that.primaryComplete;
+      this.primaryTotal      = that.primaryTotal;
+      this.secondaryComplete = secondaryComplete;
+      this.secondaryTotal    = secondaryTotal;
+    }
+
+    public void incrementPrimaryComplete() {
+      primaryComplete += 1;
+    }
+  }
+
 }
diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 0a3594e94d..c6c123cf2a 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -37,8 +37,8 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
-import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.RoutingActivity;
 import org.thoughtcrime.securesms.contacts.ContactPhotoFactory;
 import org.thoughtcrime.securesms.crypto.MasterCipher;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
@@ -79,7 +79,7 @@ public class MessageNotifier {
     if (visibleThread == threadId) {
       sendInThreadNotification(context);
     } else {
-      Intent intent = new Intent(context, ConversationListActivity.class);
+      Intent intent = new Intent(context, RoutingActivity.class);
       intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
       intent.putExtra("recipients", recipients);
       intent.putExtra("thread_id", threadId);
@@ -187,7 +187,7 @@ public class MessageNotifier {
                                           notificationState.getMessageCount()));
     builder.setContentText(String.format(context.getString(R.string.MessageNotifier_most_recent_from_s),
                                          notifications.get(0).getRecipientName()));
-    builder.setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, ConversationListActivity.class), 0));
+    builder.setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, RoutingActivity.class), 0));
 
     InboxStyle style = new InboxStyle();
 
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
index 50a4ac9814..a37a7aad97 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.text.SpannableStringBuilder;
 
-import org.thoughtcrime.securesms.ConversationListActivity;
+import org.thoughtcrime.securesms.RoutingActivity;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.Util;
 
@@ -62,7 +62,7 @@ public class NotificationItem {
   }
 
   public PendingIntent getPendingIntent(Context context) {
-    Intent intent = new Intent(context, ConversationListActivity.class);
+    Intent intent = new Intent(context, RoutingActivity.class);
     intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
 
     if (recipients.getPrimaryRecipient() != null) {
diff --git a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
index fde554dfb4..464ad2f208 100644
--- a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
+++ b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
@@ -4,41 +4,64 @@ import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.BitmapFactory;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
-import android.widget.RemoteViews;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
 
-import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.RoutingActivity;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.SmsMigrator;
+import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 public class ApplicationMigrationService extends Service
     implements SmsMigrator.SmsMigrationProgressListener
   {
 
-  public static final int PROGRESS_UPDATE   = 1;
-  public static final int PROGRESS_COMPLETE = 2;
+  public  static final String MIGRATE_DATABASE  = "org.thoughtcrime.securesms.ApplicationMigration.MIGRATE_DATABSE";
+  public  static final String COMPLETED_ACTION  = "org.thoughtcrime.securesms.ApplicationMigrationService.COMPLETED";
+  private static final String PREFERENCES_NAME  = "SecureSMS";
+  private static final String DATABASE_MIGRATED = "migrated";
 
-  public static final String MIGRATE_DATABASE  = "org.thoughtcrime.securesms.ApplicationMigration.MIGRATE_DATABSE";
+  private final BroadcastReceiver completedReceiver = new CompletedReceiver();
+  private final Binder binder                       = new ApplicationMigrationBinder();
+  private final Executor executor                   = Executors.newSingleThreadExecutor();
 
-  private final Binder binder       = new ApplicationMigrationBinder();
-  private boolean isMigrating       = false;
-  private Handler handler           = null;
-  private Notification notification = null;
+  private Handler handler                         = null;
+  private NotificationCompat.Builder notification = null;
+  private ImportState state                       = new ImportState(ImportState.STATE_IDLE, null);
 
   @Override
-  public void onStart(Intent intent, int startId) {
-    if (intent == null) return;
+  public void onCreate() {
+    registerCompletedReceiver();
+  }
+
+  @Override
+  public int onStartCommand(Intent intent, int flags, int startId) {
+    if (intent == null) return START_NOT_STICKY;
 
     if (intent.getAction() != null && intent.getAction().equals(MIGRATE_DATABASE)) {
-      handleDatabaseMigration((MasterSecret)intent.getParcelableExtra("master_secret"));
+      executor.execute(new ImportRunnable(intent));
     }
+
+    return START_NOT_STICKY;
+  }
+
+  @Override
+  public void onDestroy() {
+    unregisterCompletedReceiver();
   }
 
   @Override
@@ -46,70 +69,106 @@ public class ApplicationMigrationService extends Service
     return binder;
   }
 
-  private void handleDatabaseMigration(final MasterSecret masterSecret) {
-    this.notification = initializeBackgroundNotification();
-
-    final PowerManager power = (PowerManager)getSystemService(Context.POWER_SERVICE);
-    final WakeLock wakeLock  = power.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Migration");
-
-    new Thread() {
-      @Override
-      public void run() {
-        try {
-          wakeLock.acquire();
-
-          setMigrating(true);
-          SmsMigrator.migrateDatabase(ApplicationMigrationService.this,
-                                      masterSecret,
-                                      ApplicationMigrationService.this);
-          setMigrating(false);
-
-          if (handler != null) {
-            handler.obtainMessage(PROGRESS_COMPLETE).sendToTarget();
-          }
-
-          stopForeground(true);
-        } finally {
-          wakeLock.release();
-          stopService(new Intent(ApplicationMigrationService.this,
-                                 ApplicationMigrationService.class));
-        }
-      }
-    }.start();
+  public void setImportStateHandler(Handler handler) {
+    this.handler = handler;
   }
 
-  private Notification initializeBackgroundNotification() {
-    Intent intent               = new Intent(this, ConversationListActivity.class);
-    Notification notification   = new Notification(R.drawable.icon,
-                                                   getString(R.string.ApplicationMigrationService_migrating),
-                                                   System.currentTimeMillis());
+  private void registerCompletedReceiver() {
+    IntentFilter filter = new IntentFilter();
+    filter.addAction(COMPLETED_ACTION);
 
-    notification.flags       = notification.flags | Notification.FLAG_ONGOING_EVENT;
-    notification.contentView = new RemoteViews(getApplicationContext().getPackageName(),
-                                               R.layout.migration_notification_progress);
+    registerReceiver(completedReceiver, filter);
+  }
 
-    notification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
-    notification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);
-    notification.contentView.setTextViewText(R.id.status_text,
-                                             getString(R.string.ApplicationMigrationService_migrating_system_text_messages));
-    notification.contentView.setProgressBar(R.id.status_progress, 10000, 0, false);
+  private void unregisterCompletedReceiver() {
+    unregisterReceiver(completedReceiver);
+  }
+
+  private void notifyImportComplete() {
+    Intent intent = new Intent();
+    intent.setAction(COMPLETED_ACTION);
+
+    sendOrderedBroadcast(intent, null);
+  }
+
+  @Override
+  public void progressUpdate(ProgressDescription progress) {
+    setState(new ImportState(ImportState.STATE_MIGRATING_IN_PROGRESS, progress));
+  }
+
+  public ImportState getState() {
+    return state;
+  }
+
+  private void setState(ImportState state) {
+    this.state = state;
+
+    if (handler != null) {
+      handler.obtainMessage(state.state, state.progress).sendToTarget();
+    }
+
+    if (state.progress != null && state.progress.secondaryComplete == 0) {
+      updateBackgroundNotification(state.progress.primaryTotal, state.progress.primaryComplete);
+    }
+  }
+
+  private void updateBackgroundNotification(int total, int complete) {
+    notification.setProgress(total, complete, false);
+
+    ((NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE))
+      .notify(4242, notification.build());
+  }
+
+  private NotificationCompat.Builder initializeBackgroundNotification() {
+    NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+
+    builder.setSmallIcon(R.drawable.icon_notification);
+    builder.setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.icon_notification));
+    builder.setContentTitle(getString(R.string.ApplicationMigrationService_importing_text_messages));
+    builder.setContentText(getString(R.string.ApplicationMigrationService_import_in_progress));
+    builder.setOngoing(true);
+    builder.setProgress(100, 0, false);
+    builder.setContentIntent(PendingIntent.getActivity(this, 0, new Intent(this, RoutingActivity.class), 0));
 
     stopForeground(true);
-    startForeground(4242, notification);
+    startForeground(4242, builder.build());
 
-    return notification;
+    return builder;
   }
 
-  private synchronized void setMigrating(boolean isMigrating) {
-    this.isMigrating = isMigrating;
-  }
+  private class ImportRunnable implements Runnable {
+    private final MasterSecret masterSecret;
 
-  public synchronized boolean isMigrating() {
-    return isMigrating;
-  }
+    public ImportRunnable(Intent intent) {
+      this.masterSecret = intent.getParcelableExtra("master_secret");
+      Log.w("ApplicationMigrationService", "Service got mastersecret: " + masterSecret);
+    }
 
-  public void setHandler(Handler handler) {
-    this.handler = handler;
+    @Override
+    public void run() {
+      notification              = initializeBackgroundNotification();
+      PowerManager powerManager = (PowerManager)getSystemService(Context.POWER_SERVICE);
+      WakeLock     wakeLock     = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Migration");
+
+      try {
+        wakeLock.acquire();
+
+        setState(new ImportState(ImportState.STATE_MIGRATING_BEGIN, null));
+
+        SmsMigrator.migrateDatabase(ApplicationMigrationService.this,
+                                    masterSecret,
+                                    ApplicationMigrationService.this);
+
+        setState(new ImportState(ImportState.STATE_MIGRATING_COMPLETE, null));
+
+        setDatabaseImported(ApplicationMigrationService.this);
+        stopForeground(true);
+        notifyImportComplete();
+        stopSelf();
+      } finally {
+        wakeLock.release();
+      }
+    }
   }
 
   public class ApplicationMigrationBinder extends Binder {
@@ -118,20 +177,44 @@ public class ApplicationMigrationService extends Service
     }
   }
 
-  @Override
-  public void progressUpdate(int primaryProgress, int secondaryProgress) {
-    if (handler != null) {
-      handler.obtainMessage(PROGRESS_UPDATE, primaryProgress, secondaryProgress).sendToTarget();
-    }
+  private class CompletedReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
+      builder.setSmallIcon(R.drawable.icon_notification);
+      builder.setContentTitle("Import Complete");
+      builder.setContentText("TextSecure system database import is complete.");
+      builder.setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, RoutingActivity.class), 0));
+      builder.setWhen(System.currentTimeMillis());
+      builder.setDefaults(Notification.DEFAULT_VIBRATE);
+      builder.setAutoCancel(true);
 
-    if (notification != null && secondaryProgress == 0) {
-      notification.contentView.setProgressBar(R.id.status_progress, 10000, primaryProgress, false);
-
-      NotificationManager notificationManager =
-          (NotificationManager)getApplicationContext()
-            .getSystemService(Context.NOTIFICATION_SERVICE);
-
-      notificationManager.notify(4242, notification);
+      Notification notification = builder.build();
+      ((NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE)).notify(31337, notification);
     }
   }
+
+  public static class ImportState {
+    public static final int STATE_IDLE                  = 0;
+    public static final int STATE_MIGRATING_BEGIN       = 1;
+    public static final int STATE_MIGRATING_IN_PROGRESS = 2;
+    public static final int STATE_MIGRATING_COMPLETE    = 3;
+
+    public int                 state;
+    public ProgressDescription progress;
+
+    public ImportState(int state, ProgressDescription progress) {
+      this.state    = state;
+      this.progress = progress;
+    }
+  }
+
+  public static boolean isDatabaseImported(Context context) {
+    return context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
+              .getBoolean(DATABASE_MIGRATED, false);
+  }
+
+  public static void setDatabaseImported(Context context) {
+    context.getSharedPreferences(PREFERENCES_NAME, 0).edit().putBoolean(DATABASE_MIGRATED, true).commit();
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/service/KeyCachingService.java b/src/org/thoughtcrime/securesms/service/KeyCachingService.java
index 89790405a7..9edbd47633 100644
--- a/src/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/src/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -32,8 +32,9 @@ import android.util.Log;
 import android.widget.RemoteViews;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
-import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.RoutingActivity;
+import org.thoughtcrime.securesms.crypto.DecryptingQueue;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 
@@ -54,8 +55,6 @@ public class KeyCachingService extends Service {
   public  static final String CLEAR_KEY_ACTION         = "org.thoughtcrime.securesms.service.action.CLEAR_KEY";
   public  static final String ACTIVITY_START_EVENT     = "org.thoughtcrime.securesms.service.action.ACTIVITY_START_EVENT";
   public  static final String ACTIVITY_STOP_EVENT      = "org.thoughtcrime.securesms.service.action.ACTIVITY_STOP_EVENT";
-  public  static final String PREFERENCES_NAME         = "SecureSMS-Preferences";
-
 
   private PendingIntent pending;
   private int activitiesRunning = 0;
@@ -75,6 +74,7 @@ public class KeyCachingService extends Service {
     foregroundService();
     broadcastNewSecret();
     startTimeoutIfAppropriate();
+    DecryptingQueue.schedulePendingDecrypts(this, masterSecret);
 
     new Thread() {
       @Override
@@ -178,7 +178,9 @@ public class KeyCachingService extends Service {
     Notification notification  = new Notification(R.drawable.icon_cached,
                                                   getString(R.string.KeyCachingService_textsecure_passphrase_cached),
                                                   System.currentTimeMillis());
-    Intent intent              = new Intent(this, ConversationListActivity.class);
+    Intent intent              = new Intent(this, RoutingActivity.class);
+    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+
     PendingIntent launchIntent = PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
     notification.setLatestEventInfo(getApplicationContext(),
                                     getString(R.string.KeyCachingService_passphrase_cached),