diff --git a/res/layout/auto_initiate_activity.xml b/res/layout/auto_initiate_activity.xml
index 6a3e71e8ce..df72136d9c 100644
--- a/res/layout/auto_initiate_activity.xml
+++ b/res/layout/auto_initiate_activity.xml
@@ -3,29 +3,30 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="10px">
+    android:layout_marginLeft="16dip"
+    android:layout_marginRight="16dip">
 
-	<TextView android:id="@+id/description_text"
-			  android:layout_width="fill_parent"
-			  android:layout_height="wrap_content"
-			  android:layout_marginBottom="5px" 
-			  android:text="You have received a message from someone who supports TextSecure encrypted sessions.  Would you like to initiate a key exchange so you can communicate securely?"/>
-			   
-	<LinearLayout android:layout_width="fill_parent"
-				  android:layout_height="wrap_content"
-				  android:layout_marginTop="10px"
-				  android:orientation="horizontal">
-				  
-		<Button android:id="@+id/initiate_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="Initiate Exchange"
-				android:gravity="center"/>
-				
-		<Button android:id="@+id/cancel_button"
-				android:text="Cancel"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="center"/>
-	</LinearLayout>
+    <TextView android:id="@+id/description_text"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="5px"
+              android:text="You have received a message from someone who supports TextSecure encrypted sessions.  Would you like to initiate a key exchange so you can communicate securely?"/>
+
+    <LinearLayout android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="10px"
+                  android:orientation="horizontal">
+
+        <Button android:id="@+id/initiate_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Initiate Exchange"
+                android:gravity="center"/>
+
+        <Button android:id="@+id/cancel_button"
+                android:text="Cancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"/>
+    </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/save_identity_activity.xml b/res/layout/save_identity_activity.xml
index 5dab264475..31d267cb7c 100644
--- a/res/layout/save_identity_activity.xml
+++ b/res/layout/save_identity_activity.xml
@@ -1,47 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
+                 android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+    <TextView android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="16dip"
+              android:layout_marginRight="16dip"
+              android:layout_marginTop="5dip"
+              android:layout_marginBottom="5dip"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:text="Identity Name:" />
+
+    <EditText android:layout_height="wrap_content"
               android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:padding="16dip">
-
-            <TextView android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:padding="5dip"
-                      android:text="Identity Name:" />
-
-            <EditText android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:padding="5dip"
-                      android:id="@+id/identity_name"
-                      android:text="" />
-
-            <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_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:visibility="visible"
-                                android:layout_marginRight="17dip"
-                                android:id="@+id/cancel_button"
-                                android:text="Cancel"/>
-
-                        <Button android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:visibility="visible"
-                                android:id="@+id/ok_button"
-                                android:text="Ok"/>
-
-                    </TableRow>
-                </TableLayout>
-            </LinearLayout>
-</LinearLayout>
+              android:id="@+id/identity_name"
+              android:layout_margin="16dip"/>
+
+    <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="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="OK"
+                        android:id="@+id/ok_button"
+                        android:layout_marginRight="16dip"/>
+            </TableRow>
+        </TableLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/AutoInitiateActivity.java b/src/org/thoughtcrime/securesms/AutoInitiateActivity.java
index c853f023a2..7ad4bd14bc 100644
--- a/src/org/thoughtcrime/securesms/AutoInitiateActivity.java
+++ b/src/org/thoughtcrime/securesms/AutoInitiateActivity.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,20 +10,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms;
 
-import org.thoughtcrime.securesms.crypto.KeyExchangeInitiator;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.database.LocalKeyRecord;
-import org.thoughtcrime.securesms.database.RemoteKeyRecord;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.MemoryCleaner;
-
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -32,28 +24,37 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 
+import com.actionbarsherlock.app.SherlockActivity;
+
+import org.thoughtcrime.securesms.crypto.KeyExchangeInitiator;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.LocalKeyRecord;
+import org.thoughtcrime.securesms.database.RemoteKeyRecord;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.MemoryCleaner;
+
 /**
  * Activity which prompts the user to initiate a secure
  * session.  Initiated by whitespace tag detection from
  * the remote endpoint.
- * 
+ *
  * @author Moxie Marlinspike
  *
  */
-public class AutoInitiateActivity extends Activity {
+public class AutoInitiateActivity extends SherlockActivity {
 
   private long threadId;
   private Recipient recipient;
   private MasterSecret masterSecret;
-	
+
   @Override
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
     setContentView(R.layout.auto_initiate_activity);
-		
+
     initializeResources();
   }
-  
+
   @Override
   public void onDestroy() {
     MemoryCleaner.clean(masterSecret);
@@ -64,22 +65,22 @@ public class AutoInitiateActivity extends Activity {
     this.threadId     = this.getIntent().getLongExtra("threadId", -1);
     this.recipient    = (Recipient)this.getIntent().getParcelableExtra("recipient");
     this.masterSecret = (MasterSecret)this.getIntent().getParcelableExtra("masterSecret");
-		
-    ((Button)findViewById(R.id.initiate_button)).setOnClickListener(new OkListener());		
+
+    ((Button)findViewById(R.id.initiate_button)).setOnClickListener(new OkListener());
     ((Button)findViewById(R.id.cancel_button)).setOnClickListener(new CancelListener());
   }
-	
+
   private void initiateKeyExchange() {
     KeyExchangeInitiator.initiate(this, masterSecret, recipient, true);
     finish();
   }
-	
+
   private class OkListener implements View.OnClickListener {
     public void onClick(View v) {
       initiateKeyExchange();
     }
   }
-	
+
   private class CancelListener implements View.OnClickListener {
     public void onClick(View v) {
       Log.w("AutoInitiateActivity", "Exempting threadID: " + threadId);
@@ -87,16 +88,16 @@ public class AutoInitiateActivity extends Activity {
       AutoInitiateActivity.this.finish();
     }
   }
-	
+
   public static void exemptThread(Context context, long threadId) {
     SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-    sp.edit().putBoolean("pref_thread_auto_init_exempt_" + threadId, true).commit();		
+    sp.edit().putBoolean("pref_thread_auto_init_exempt_" + threadId, true).commit();
   }
-	
-  public static boolean isValidAutoInitiateSituation(Context context, MasterSecret masterSecret, 
-						     Recipient recipient, String message, long threadId) 
+
+  public static boolean isValidAutoInitiateSituation(Context context, MasterSecret masterSecret,
+                 Recipient recipient, String message, long threadId)
   {
-    return 
+    return
       isMessageTagged(message)             &&
       isThreadQualified(context, threadId) &&
       isExchangeQualified(context, masterSecret, recipient);
@@ -110,11 +111,11 @@ public class AutoInitiateActivity extends Activity {
     SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
     return !sp.getBoolean("pref_thread_auto_init_exempt_" + threadId, false);
   }
-	
+
   private static boolean isExchangeQualified(Context context, MasterSecret masterSecret, Recipient recipient) {
-    return 
+    return
       (new RemoteKeyRecord(context,recipient).getCurrentRemoteKey() == null) &&
       (new LocalKeyRecord(context, masterSecret, recipient).getCurrentKeyPair() == null);
   }
-	
+
 }
diff --git a/src/org/thoughtcrime/securesms/SaveIdentityActivity.java b/src/org/thoughtcrime/securesms/SaveIdentityActivity.java
index 57060361bd..b82a431329 100644
--- a/src/org/thoughtcrime/securesms/SaveIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/SaveIdentityActivity.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,19 +10,12 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms;
 
-import org.thoughtcrime.securesms.crypto.IdentityKey;
-import org.thoughtcrime.securesms.crypto.InvalidKeyException;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.util.MemoryCleaner;
-
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -32,35 +25,44 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.actionbarsherlock.app.SherlockActivity;
+
+import org.thoughtcrime.securesms.crypto.IdentityKey;
+import org.thoughtcrime.securesms.crypto.InvalidKeyException;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.util.MemoryCleaner;
+
 /**
  * Activity that provides interface for users to save
  * identity keys they receive.
- * 
+ *
  * @author Moxie Marlinspike
  */
-public class SaveIdentityActivity extends Activity {
+public class SaveIdentityActivity extends SherlockActivity {
 
   private MasterSecret masterSecret;
   private IdentityKey identityKey;
-	
+
   private EditText identityName;
   private Button okButton;
   private Button cancelButton;
-	
+
   @Override
   public void onCreate(Bundle bundle) {
     super.onCreate(bundle);
     setContentView(R.layout.save_identity_activity);
-		
+
     initializeResources();
     initializeListeners();
   }
-	
+
+  @Override
   protected void onDestroy() {
     MemoryCleaner.clean(masterSecret);
     super.onDestroy();
   }
-  
+
   private void initializeResources() {
     String nameSuggestion = getIntent().getStringExtra("name_suggestion");
 
@@ -69,31 +71,31 @@ public class SaveIdentityActivity extends Activity {
     this.identityName = (EditText)findViewById(R.id.identity_name);
     this.okButton     = (Button)findViewById(R.id.ok_button);
     this.cancelButton = (Button)findViewById(R.id.cancel_button);
-		
+
     if ((nameSuggestion != null) && (nameSuggestion.trim().length() > 0)) {
       this.identityName.setText(nameSuggestion);
     }
   }
-	
+
   private void initializeListeners() {
     this.okButton.setOnClickListener(new OkListener());
     this.cancelButton.setOnClickListener(new CancelListener());
   }
-	
+
   private class OkListener implements View.OnClickListener {
     public void onClick(View v) {
       if (identityName.getText() == null || identityName.getText().toString().trim().length() == 0) {
         Toast.makeText(SaveIdentityActivity.this, "You must specify a name for this identity!", Toast.LENGTH_LONG).show();
         return;
       }
-			
+
       try {
         DatabaseFactory.getIdentityDatabase(SaveIdentityActivity.this).saveIdentity(masterSecret, identityKey, identityName.getText().toString());
       } catch (InvalidKeyException e) {
         AlertDialog.Builder builder = new AlertDialog.Builder(SaveIdentityActivity.this);
         builder.setTitle("Identity Name Exists!");
         builder.setMessage("An identity key with the specified name already exists.");
-        builder.setPositiveButton("Manage Identities", new DialogInterface.OnClickListener() {					
+        builder.setPositiveButton("Manage Identities", new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int which) {
             Intent intent = new Intent(SaveIdentityActivity.this, ReviewIdentitiesActivity.class);
             intent.putExtra("master_secret", masterSecret);
@@ -104,15 +106,15 @@ public class SaveIdentityActivity extends Activity {
         builder.show();
         return;
       }
-			
+
       finish();
-    }		
+    }
   }
-	
+
   private class CancelListener implements View.OnClickListener {
     public void onClick(View v) {
       finish();
     }
   }
-	
+
 }