diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 3b2e423df..9e4f3ca49 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -115,7 +115,7 @@
             android:label="@string/title_edit_key"
             android:windowSoftInputMode="stateHidden" />
         <activity
-            android:name=".ui.KeyViewActivity"
+            android:name=".ui.ViewKeyActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_key_details"
             android:parentActivityName=".ui.KeyListPublicActivity" >
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java
index 0c709d25a..8f745bdd3 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java
@@ -18,12 +18,12 @@ package org.sufficientlysecure.keychain.ui.adapter;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.OtherHelper;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
 import org.sufficientlysecure.keychain.util.Log;
-import org.sufficientlysecure.keychain.R;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -36,7 +36,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CursorTreeAdapter;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public class KeyListAdapterOLD extends CursorTreeAdapter {
@@ -97,27 +96,27 @@ public class KeyListAdapterOLD extends CursorTreeAdapter {
         }
     }
 
-    /**
-     * Inflate new view for child items
-     */
-    @Override
-    public View newChildView(Context context, Cursor cursor, boolean isLastChild, ViewGroup parent) {
-        return mInflater.inflate(R.layout.key_list_child_item, null);
-    }
+//    /**
+//     * Inflate new view for child items
+//     */
+//    @Override
+//    public View newChildView(Context context, Cursor cursor, boolean isLastChild, ViewGroup parent) {
+//        return mInflater.inflate(R.layout.key_list_child_item, null);
+//    }
 
     /**
      * Bind TextViews from view of childs based on query results
      */
     @Override
     protected void bindChildView(View view, Context context, Cursor cursor, boolean isLastChild) {
-        LinearLayout keyLayout = (LinearLayout) view.findViewById(R.id.keyLayout);
-        LinearLayout userIdLayout = (LinearLayout) view.findViewById(R.id.userIdLayout);
+//        LinearLayout keyLayout = (LinearLayout) view.findViewById(R.id.keyLayout);
+//        LinearLayout userIdLayout = (LinearLayout) view.findViewById(R.id.userIdLayout);
 
         // first entry is fingerprint
         if (cursor.getPosition() == 0) {
             // show only userId layout
-            keyLayout.setVisibility(View.GONE);
-            userIdLayout.setVisibility(View.VISIBLE);
+//            keyLayout.setVisibility(View.GONE);
+//            userIdLayout.setVisibility(View.VISIBLE);
 
             String fingerprint = PgpKeyHelper.getFingerPrint(context,
                     cursor.getLong(cursor.getColumnIndex(Keys.KEY_ID)));
@@ -131,8 +130,8 @@ public class KeyListAdapterOLD extends CursorTreeAdapter {
         } else {
             // differentiate between keys and userIds in MergeCursor
             if (cursor.getColumnIndex(Keys.KEY_ID) != -1) {
-                keyLayout.setVisibility(View.VISIBLE);
-                userIdLayout.setVisibility(View.GONE);
+//                keyLayout.setVisibility(View.VISIBLE);
+//                userIdLayout.setVisibility(View.GONE);
 
                 String keyIdStr = PgpKeyHelper.convertKeyIdToHex(cursor.getLong(cursor
                         .getColumnIndex(Keys.KEY_ID)));
@@ -174,8 +173,8 @@ public class KeyListAdapterOLD extends CursorTreeAdapter {
                     signIcon.setVisibility(View.VISIBLE);
                 }
             } else {
-                keyLayout.setVisibility(View.GONE);
-                userIdLayout.setVisibility(View.VISIBLE);
+//                keyLayout.setVisibility(View.GONE);
+//                userIdLayout.setVisibility(View.VISIBLE);
 
                 String userIdStr = cursor.getString(cursor.getColumnIndex(UserIds.USER_ID));
 
@@ -270,4 +269,11 @@ public class KeyListAdapterOLD extends CursorTreeAdapter {
         return mContext.getContentResolver().query(uri, projection, selection, null, sortOrder);
     }
 
+    @Override
+    protected View newChildView(Context context, Cursor cursor, boolean isLastChild,
+            ViewGroup parent) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
index 79d577c58..d5c366bed 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
@@ -90,7 +90,7 @@ public class SetPassphraseDialogFragment extends DialogFragment implements OnEdi
         alert.setMessage(R.string.enter_passphrase_twice);
 
         LayoutInflater inflater = activity.getLayoutInflater();
-        View view = inflater.inflate(R.layout.passphrase_repeat_dialogf, null);
+        View view = inflater.inflate(R.layout.passphrase_repeat_dialog, null);
         alert.setView(view);
 
         mPassphraseEditText = (EditText) view.findViewById(R.id.passphrase_passphrase);