1 files changed, 4 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index 369288d2c..2e06f3f34 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -179,7 +179,10 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
         if (mType == Id.type.user_id) {
             for (int i = 0; i < mEditors.getChildCount(); ++i) {
                 UserIdEditor editor = (UserIdEditor) mEditors.getChildAt(i);
-                orig.add(editor.getOriginalID());
+                if (editor.isMainUserId())
+                    orig.add(0, editor.getOriginalID());
+                else
+                    orig.add(editor.getOriginalID());
             }
             return orig;
         } else {