Merge branch 'development' of https://github.com/open-keychain/open-keychain into development

1 files changed, 3 insertions, 1 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
index 8fdfb35cb..ed4cf5b8a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
@@ -123,7 +123,6 @@ public class CreateKeyEmailFragment extends Fragment {
         if (mAdditionalEmailModels == null) {
             mAdditionalEmailModels = new ArrayList<>();
         }
-
         if (mEmailAdapter == null) {
             mEmailAdapter = new EmailAdapter(mAdditionalEmailModels, new View.OnClickListener() {
                 @Override
@@ -136,6 +135,9 @@ public class CreateKeyEmailFragment extends Fragment {
                 mEmailAdapter.addAll(mCreateKeyActivity.mAdditionalEmails);
             }
         }
+        if (mAdditionalEmailModels.isEmpty() && mCreateKeyActivity.mAdditionalEmails != null) {
+            mEmailAdapter.addAll(mCreateKeyActivity.mAdditionalEmails);
+        }
 
         mEmailsRecyclerView.setAdapter(mEmailAdapter);