diff --git a/res/layout/fragment_edit_identity.xml b/res/layout/fragment_edit_identity.xml
index 84312ba..1c4f56f 100644
--- a/res/layout/fragment_edit_identity.xml
+++ b/res/layout/fragment_edit_identity.xml
@@ -31,11 +31,19 @@
         android:hint="@string/description"
         android:inputType="text" />
 
+    <CheckBox
+        android:id="@+id/default_identity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/description"
+        android:layout_below="@+id/description"
+        android:text="@string/default_identity" />
+
     <TextView
         android:id="@+id/error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/description"
+        android:layout_below="@+id/default_identity"
         android:textColor="@color/error_color" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a3b57f1..9cd4710 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -63,6 +63,7 @@
     <string name="pref_title_identities">Identities</string>
     <string name="public_name">Public name</string>
     <string name="description">Description</string>
+    <string name="default_identity">Default identity</string>
     <string name="save_identity">Save identity</string>
     <string name="identity_saved">Identity saved</string>
 </resources>
diff --git a/src/i2p/bote/config/EditIdentityFragment.java b/src/i2p/bote/config/EditIdentityFragment.java
index a35654b..d85762a 100644
--- a/src/i2p/bote/config/EditIdentityFragment.java
+++ b/src/i2p/bote/config/EditIdentityFragment.java
@@ -24,6 +24,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -64,6 +65,7 @@ public class EditIdentityFragment extends Fragment {
     MenuItem mSave;
     EditText mNameField;
     EditText mDescField;
+    CheckBox mDefaultField;
     TextView mError;
 
     public static EditIdentityFragment newInstance(String key) {
@@ -99,12 +101,14 @@ public class EditIdentityFragment extends Fragment {
 
         mNameField = (EditText) view.findViewById(R.id.public_name);
         mDescField = (EditText) view.findViewById(R.id.description);
+        mDefaultField = (CheckBox) view.findViewById(R.id.default_identity);
         mError = (TextView) view.findViewById(R.id.error);
 
         try {
             EmailIdentity identity = BoteHelper.getIdentity(mKey);
             mNameField.setText(identity.getPublicName());
             mDescField.setText(identity.getDescription());
+            mDefaultField.setChecked(identity.isDefault());
         } catch (PasswordException e) {
             // TODO Handle
             e.printStackTrace();
@@ -133,6 +137,7 @@ public class EditIdentityFragment extends Fragment {
         case R.id.action_save_identity:
             String publicName = mNameField.getText().toString();
             String description = mDescField.getText().toString();
+            boolean setDefault = mDefaultField.isChecked();
 
             InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
             imm.hideSoftInputFromWindow(mNameField.getWindowToken(), 0);
@@ -147,7 +152,7 @@ public class EditIdentityFragment extends Fragment {
                     publicName,
                     description,
                     null,
-                    false);
+                    setDefault);
             f.setTask(new IdentityWaiter());
             f.setTargetFragment(EditIdentityFragment.this, IDENTITY_WAITER);
             mFM.beginTransaction()