diff --git a/res/layout/fragment_view_email.xml b/res/layout/fragment_view_email.xml
index 3674a52..4aa488c 100644
--- a/res/layout/fragment_view_email.xml
+++ b/res/layout/fragment_view_email.xml
@@ -23,12 +23,12 @@
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
             <ImageView
-                android:id="@+id/contact_picture"
+                android:id="@+id/picture"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignLeft="@+id/email_subject"
                 android:layout_below="@+id/email_subject"
-                android:src="@drawable/ic_launcher" />
+                android:src="@drawable/ic_contact_picture" />
 
             <TableLayout
                 android:layout_width="wrap_content"
@@ -36,7 +36,7 @@
                 android:layout_below="@+id/email_subject"
                 android:layout_marginBottom="5dp"
                 android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@+id/contact_picture" >
+                android:layout_toRightOf="@+id/picture" >
 
                 <TableRow
                     android:layout_width="wrap_content"
diff --git a/res/layout/fragment_view_identity.xml b/res/layout/fragment_view_identity.xml
index d046272..f75de0e 100644
--- a/res/layout/fragment_view_identity.xml
+++ b/res/layout/fragment_view_identity.xml
@@ -10,7 +10,7 @@
         android:id="@+id/identity_picture"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_launcher" />
+        android:src="@drawable/ic_contact_picture" />
 
     <TextView
         android:id="@+id/public_name"
diff --git a/src/i2p/bote/android/ViewEmailFragment.java b/src/i2p/bote/android/ViewEmailFragment.java
index ce4bbb6..cc44d0a 100644
--- a/src/i2p/bote/android/ViewEmailFragment.java
+++ b/src/i2p/bote/android/ViewEmailFragment.java
@@ -66,7 +66,7 @@ public class ViewEmailFragment extends Fragment {
 
     private void displayEmail(Email email, View v) {
         TextView subject = (TextView) v.findViewById(R.id.email_subject);
-        ImageView picture = (ImageView) v.findViewById(R.id.contact_picture);
+        ImageView picture = (ImageView) v.findViewById(R.id.picture);
         TextView sender = (TextView) v.findViewById(R.id.email_sender);
         LinearLayout recipients = (LinearLayout) v.findViewById(R.id.email_recipients);
         TextView sent = (TextView) v.findViewById(R.id.email_sent);
diff --git a/src/i2p/bote/android/config/EditIdentityFragment.java b/src/i2p/bote/android/config/EditIdentityFragment.java
index 963f107..fa9117b 100644
--- a/src/i2p/bote/android/config/EditIdentityFragment.java
+++ b/src/i2p/bote/android/config/EditIdentityFragment.java
@@ -60,7 +60,7 @@ public class EditIdentityFragment extends EditPictureFragment {
     public static final String IDENTITY_KEY = "identity_key";
 
     // Code to identify the fragment that is calling onActivityResult().
-    static final int IDENTITY_WAITER = 0;
+    static final int IDENTITY_WAITER = 3;
     // Tag so we can find the task fragment again, in another
     // instance of this fragment after rotation.
     static final String IDENTITY_WAITER_TAG = "identityWaiterTask";
@@ -204,6 +204,8 @@ public class EditIdentityFragment extends EditPictureFragment {
                 setInterfaceEnabled(true);
                 mError.setText(data.getStringExtra("error"));
             }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
         }
     }
 
diff --git a/src/i2p/bote/android/config/ViewIdentityFragment.java b/src/i2p/bote/android/config/ViewIdentityFragment.java
index 6b2838a..f6f61e2 100644
--- a/src/i2p/bote/android/config/ViewIdentityFragment.java
+++ b/src/i2p/bote/android/config/ViewIdentityFragment.java
@@ -8,6 +8,7 @@ import i2p.bote.android.util.BoteHelper;
 import i2p.bote.email.EmailIdentity;
 import i2p.bote.fileencryption.PasswordException;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -16,6 +17,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 public class ViewIdentityFragment extends Fragment {
@@ -24,6 +26,7 @@ public class ViewIdentityFragment extends Fragment {
     private String mKey;
     private EmailIdentity mIdentity;
 
+    ImageView mIdentityPicture;
     TextView mNameField;
     TextView mDescField;
     TextView mCryptoField;
@@ -53,14 +56,16 @@ public class ViewIdentityFragment extends Fragment {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        mIdentityPicture = (ImageView) view.findViewById(R.id.identity_picture);
+        mNameField = (TextView) view.findViewById(R.id.public_name);
+        mDescField = (TextView) view.findViewById(R.id.description);
+        mCryptoField = (TextView) view.findViewById(R.id.crypto_impl);
+        mKeyField = (TextView) view.findViewById(R.id.key);
+
         mKey = getArguments().getString(IDENTITY_KEY);
         if (mKey != null) {
             try {
                 mIdentity = BoteHelper.getIdentity(mKey);
-                mNameField = (TextView) view.findViewById(R.id.public_name);
-                mDescField = (TextView) view.findViewById(R.id.description);
-                mCryptoField = (TextView) view.findViewById(R.id.crypto_impl);
-                mKeyField = (TextView) view.findViewById(R.id.key);
             } catch (PasswordException e) {
                 // TODO Handle
                 e.printStackTrace();
@@ -79,6 +84,10 @@ public class ViewIdentityFragment extends Fragment {
         super.onResume();
 
         if (mIdentity != null) {
+            Bitmap picture = BoteHelper.decodePicture(mIdentity.getPictureBase64());
+            if (picture != null)
+                mIdentityPicture.setImageBitmap(picture);
+
             mNameField.setText(mIdentity.getPublicName());
             mDescField.setText(mIdentity.getDescription());
             mCryptoField.setText(mIdentity.getCryptoImpl().getName());