diff --git a/app/build.gradle b/app/build.gradle
index c86da45..ef1aaad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,8 @@ preBuild.dependsOn precompile
 clean.dependsOn preclean
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:+'
     compile fileTree(dir: 'libs', include: '*.jar')
+    compile 'com.android.support:support-v4:19.+'
+    compile 'com.android.support:appcompat-v7:19.+'
     compile 'com.github.chrisbanes.actionbarpulltorefresh:extra-abc:+'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bbd8be8..e4b06b7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="i2p.bote.android"
     android:versionCode="1"
     android:versionName="0.1" >
+
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-sdk
@@ -14,9 +15,10 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
-        <service android:name="i2p.bote.android.service.BoteService" />
+        <service android:name=".service.BoteService" />
+
         <activity
-            android:name="i2p.bote.android.EmailListActivity"
+            android:name=".EmailListActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop" >
             <intent-filter>
@@ -26,32 +28,32 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="i2p.bote.android.ViewEmailActivity"
-            android:parentActivityName="i2p.bote.android.EmailListActivity" />
+            android:name=".ViewEmailActivity"
+            android:parentActivityName=".EmailListActivity" />
         <activity
-            android:name="i2p.bote.android.NewEmailActivity"
-            android:parentActivityName="i2p.bote.android.EmailListActivity" />
+            android:name=".NewEmailActivity"
+            android:parentActivityName=".EmailListActivity" />
         <activity
-            android:name="i2p.bote.android.addressbook.AddressBookActivity"
-            android:parentActivityName="i2p.bote.android.EmailListActivity" />
+            android:name=".addressbook.AddressBookActivity"
+            android:parentActivityName=".EmailListActivity" />
         <activity
-            android:name="i2p.bote.android.addressbook.EditContactActivity"
-            android:parentActivityName="i2p.bote.android.addressbook.AddressBookActivity" />
+            android:name=".addressbook.EditContactActivity"
+            android:parentActivityName=".addressbook.AddressBookActivity" />
         <activity
-            android:name="i2p.bote.android.NetworkInfoActivity"
-            android:parentActivityName="i2p.bote.android.EmailListActivity" />
+            android:name=".NetworkInfoActivity"
+            android:parentActivityName=".EmailListActivity" />
         <activity
-            android:name="i2p.bote.android.config.SettingsActivity"
-            android:parentActivityName="i2p.bote.android.EmailListActivity" />
+            android:name=".config.SettingsActivity"
+            android:parentActivityName=".EmailListActivity" />
         <activity
-            android:name="i2p.bote.android.config.SetPasswordActivity"
-            android:parentActivityName="i2p.bote.android.config.SettingsActivity" />
+            android:name=".config.SetPasswordActivity"
+            android:parentActivityName=".config.SettingsActivity" />
         <activity
-            android:name="i2p.bote.android.config.ViewIdentityActivity"
-            android:parentActivityName="i2p.bote.android.config.SettingsActivity" />
+            android:name=".config.ViewIdentityActivity"
+            android:parentActivityName=".config.SettingsActivity" />
         <activity
-            android:name="i2p.bote.android.config.EditIdentityActivity"
-            android:parentActivityName="i2p.bote.android.config.ViewIdentityActivity" />
+            android:name=".config.EditIdentityActivity"
+            android:parentActivityName=".config.ViewIdentityActivity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 069037c..5733df1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <color name="uva_color">#c31756</color>
     <color name="default_color">#111</color>
     <color name="error_color">#f00</color>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7fef346..ec3ec55 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,40 +7,33 @@
     <string name="action_start_bote">Connect to network</string>
     <string name="action_stop_bote">Disconnect from network</string>
     <string name="action_settings">Settings</string>
-
     <string name="start_i2p_android">It appears that I2P Android is not running. Would you like to start it?</string>
     <string name="pull_text">Pull to check email</string>
     <string name="refreshing_text">Checking email...</string>
     <string name="release_text">Let go to check email</string>
-
     <string name="items_selected">%s selected</string>
     <string name="action_delete">Delete</string>
     <string name="action_mark_read">Mark read</string>
     <string name="action_mark_unread">Mark unread</string>
     <string name="action_move_to">Move to</string>
-
     <string name="drawer_open">Open nav</string>
     <string name="drawer_close">Close nav</string>
-
     <string name="enter_password">Enter password:</string>
-    <string name="checking_password">Checking password&#8230;</string>
+    <string name="checking_password">Checking password…</string>
     <string name="password_incorrect">Password was incorrect</string>
     <string name="password_file_error">Could not read password verification file</string>
     <string name="not_authed">Not authenticated</string>
-
     <string name="folder_inbox">Inbox</string>
     <string name="folder_outbox">Outbox</string>
     <string name="folder_sent">Sent</string>
     <string name="folder_trash">Trash</string>
     <string name="address_book">Address book</string>
     <string name="network_status">Network status</string>
-
     <string name="not_started">Not started</string>
-    <string name="connect_delay">Waiting 3 minutes&#8230;</string>
-    <string name="connecting">Connecting&#8230;</string>
+    <string name="connect_delay">Waiting 3 minutes…</string>
+    <string name="connecting">Connecting…</string>
     <string name="connected">Connected</string>
     <string name="error">Error</string>
-
     <string name="folder_empty">Folder is empty</string>
     <string name="folder_does_not_exist">Folder does not exist</string>
 
@@ -60,41 +53,34 @@
     <string name="error_creating_packets">Error creating email packets: %s</string>
     <string name="error_sending">Error while sending email: %s</string>
     <string name="error_saving_metadata">Error saving email metadata: %s</string>
-
     <string name="email_from">From:</string>
     <string name="email_to">To:</string>
     <string name="label_sent">Sent:</string>
     <string name="email_received">Received:</string>
     <string name="email_status">Status:</string>
     <string name="reply">Reply</string>
-
     <string name="compose">Compose</string>
     <string name="subject">Subject</string>
     <string name="compose_email">Compose email</string>
     <string name="add_one_recipient">Add at least one recipient.</string>
     <string name="email_queued_for_sending">Email queued for sending</string>
-
     <string name="response_prefix_re">Re:</string>
     <string name="response_prefix_re_hide" translatable="false">Re:</string>
     <string name="response_quote_wrote">%s wrote:</string>
     <string name="response_quote_wrote_hide" translatable="false">%s wrote:</string>
-
     <string name="address_book_empty">Address book is empty</string>
     <string name="action_new_contact">New contact</string>
-
     <string name="contact_name">Contact name</string>
     <string name="email_destination">Email destination</string>
     <string name="label_browse">Browse</string>
     <string name="save_contact">Save contact</string>
     <string name="delete_contact">Delete contact?</string>
-
     <string name="network_info_unavailable">Network information is not available because Bote hasn\'t started connecting to the network yet.</string>
     <string name="local_destination">Local Destination:</string>
     <string name="not_set">Not set</string>
     <string name="kademlia_peers">Kademlia Peers:</string>
     <string name="relay_peers">Relay Peers:</string>
     <string name="banned_peers">Banned Peers:</string>
-
     <string name="pref_title_general">General</string>
     <string name="pref_summ_general">General settings and default identity settings</string>
     <string name="pref_title_autoMail">Auto-check mail</string>
@@ -116,13 +102,11 @@
     <string name="pref_summ_maxDelay">%s minutes</string>
     <string name="pref_title_i2cp_host">I2CP host</string>
     <string name="pref_title_i2cp_port">I2CP port</string>
-
     <string name="pref_title_change_password">Change password</string>
     <string name="old_password">Old password</string>
     <string name="new_password">New password</string>
     <string name="confirm_new_password">Confirm new password</string>
     <string name="password_changed">Password changed successfully</string>
-
     <string name="pref_title_identities">Identities</string>
     <string name="new_identity">New identity...</string>
     <string name="edit_identity">Edit identity</string>
@@ -132,4 +116,5 @@
     <string name="save_identity">Save identity</string>
     <string name="delete_identity">Delete identity?</string>
     <string name="identity_saved">Identity saved</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 74ff1cf..0a1da3f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <!--
@@ -14,6 +15,7 @@
 
     <!-- Application theme. -->
     <style name="AppTheme" parent="AppBaseTheme">
+
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
         <item name="ptrHeaderStyle">@style/Widget.Custom.PtrHeader</item>
     </style>
@@ -25,6 +27,7 @@
       library/res/attrs.xml are actually read in.
     -->
     <style name="Widget.Custom.PtrHeader" parent="android:Widget">
+
         <!-- The strings to be displayed at the various states -->
         <item name="ptrPullText">@string/pull_text</item>
         <item name="ptrRefreshingText">@string/refreshing_text</item>