action bar and a small fix

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
index e3747aeb9..b499a429a 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
@@ -137,12 +137,12 @@ public class UserIdEditor extends LinearLayout implements Editor, OnClickListene
             mOriginalName = result[0];
         }
         if (result[1] != null) {
-            mComment.setText(result[1]);
-            mOriginalComment = result[1];
+            mEmail.setText(result[1]);
+            mOriginalEmail = result[1];
         }
         if (result[2] != null) {
-            mEmail.setText(result[2]);
-            mOriginalEmail = result[2];
+            mComment.setText(result[2]);
+            mOriginalComment = result[2];
         }
 
         mOriginallyMainUserID = isMainID;