diff --git a/res/layout/identity_key_view.xml b/res/layout/identity_key_view.xml
deleted file mode 100644
index 27485d94b9..0000000000
--- a/res/layout/identity_key_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.IdentityKeyView xmlns:android="http://schemas.android.com/apk/res/android"
-                                            android:layout_width="fill_parent"
-                                            android:layout_height="wrap_content"
-                                            android:paddingRight="10dip">
-
-    <FrameLayout android:id="@+id/contact_photo_frame"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_centerVertical="true"
-                 android:layout_alignParentLeft="true"
-                 android:visibility="visible">
-        <QuickContactBadge android:id="@+id/contact_photo_badge"
-                           style="?android:attr/quickContactBadgeStyleWindowLarge"
-                           android:visibility="gone" />
-
-        <ImageView android:id="@+id/contact_photo_image"
-                   android:layout_width="60dp"
-                   android:layout_height="60dp"
-                   android:cropToPadding="true"
-                   android:scaleType="centerCrop"
-                   android:visibility="gone" />
-    </FrameLayout>
-
-    <TextView android:id="@+id/identity_name"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:singleLine="true"
-              android:layout_marginTop="6dip"
-              android:layout_marginRight="5dip"
-              android:layout_marginLeft="5dip"
-              android:layout_alignTop="@id/contact_photo_frame"
-              android:layout_toRightOf="@id/contact_photo_frame"
-              android:layout_alignWithParentIfMissing="true"
-              android:ellipsize="marquee"/>
-
-    <TextView android:id="@+id/fingerprint"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceSmall"
-              android:singleLine="true"
-              android:layout_marginBottom="10dip"
-              android:layout_marginLeft="5dip"
-              android:layout_alignBottom="@id/contact_photo_frame"
-              android:layout_toRightOf="@id/contact_photo_frame"
-              android:layout_toLeftOf="@id/date"
-              android:ellipsize="end" />
-
-</org.thoughtcrime.securesms.IdentityKeyView>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/IdentityKeyView.java b/src/org/thoughtcrime/securesms/IdentityKeyView.java
deleted file mode 100644
index dc1bdcbf94..0000000000
--- a/src/org/thoughtcrime/securesms/IdentityKeyView.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (C) 2011 Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Handler;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.QuickContactBadge;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import org.whispersystems.textsecure.crypto.IdentityKey;
-import org.thoughtcrime.securesms.database.IdentityDatabase;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.Recipients;
-
-/**
- * List item view for displaying user identity keys.
- *
- * @author Moxie Marlinspike
- */
-public class IdentityKeyView extends RelativeLayout
-    implements Recipient.RecipientModifiedListener
-{
-
-  private TextView          identityName;
-  private TextView          fingerprint;
-  private QuickContactBadge contactBadge;
-  private ImageView         contactImage;
-
-  private Recipients  recipients;
-  private IdentityKey identityKey;
-
-  private final Handler handler = new Handler();
-
-  public IdentityKeyView(Context context) {
-    super(context);
-  }
-
-  public IdentityKeyView(Context context, AttributeSet attributeSet) {
-    super(context, attributeSet);
-  }
-
-  @Override
-  public void onFinishInflate() {
-    this.identityName = (TextView)findViewById(R.id.identity_name);
-    this.fingerprint  = (TextView)findViewById(R.id.fingerprint);
-    this.contactBadge = (QuickContactBadge)findViewById(R.id.contact_photo_badge);
-    this.contactImage = (ImageView)findViewById(R.id.contact_photo_image);
-
-    if (isBadgeEnabled()) {
-      this.contactBadge.setVisibility(View.VISIBLE);
-      this.contactImage.setVisibility(View.GONE);
-    } else {
-      this.contactBadge.setVisibility(View.GONE);
-      this.contactImage.setVisibility(View.VISIBLE);
-    }
-  }
-
-  public void set(IdentityDatabase.Identity identity) {
-    this.recipients  = identity.getRecipients();
-    this.identityKey = identity.getIdentityKey();
-
-    this.recipients.addListener(this);
-
-    identityName.setText(recipients.toShortString());
-    fingerprint.setText(identity.getIdentityKey().getFingerprint());
-
-    contactBadge.setImageBitmap(recipients.getPrimaryRecipient().getContactPhoto());
-    contactBadge.assignContactFromPhone(recipients.getPrimaryRecipient().getNumber(), true);
-    contactImage.setImageBitmap(recipients.getPrimaryRecipient().getContactPhoto());
-  }
-
-  public IdentityKey getIdentityKey() {
-    return this.identityKey;
-  }
-
-  public Recipient getRecipient() {
-    return this.recipients.getPrimaryRecipient();
-  }
-
-  private boolean isBadgeEnabled() {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB;
-  }
-
-  @Override
-  public void onModified(Recipient recipient) {
-    handler.post(new Runnable() {
-      @Override
-      public void run() {
-        IdentityKeyView.this.identityName.setText(recipients.toShortString());
-      }
-    });
-  }
-}