From ff4d6a66c8628246daa567d606858a3f0890759c Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Wed, 11 Apr 2012 04:47:10 +0200
Subject: [PATCH] Fixed bug introduced with
 6f525f0e31d43271654a06561aa422d7faac782e

Intent extra was renamed but the code in MessageCompose still used the
(hardcoded) old name.
---
 src/com/fsck/k9/activity/MessageCompose.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 1763a297c..a62357a64 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1837,16 +1837,15 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         case CONTACT_PICKER_TO2:
         case CONTACT_PICKER_CC2:
         case CONTACT_PICKER_BCC2:
-            String emailAddr = data.getStringExtra("EMAIL_ADDRESS");
+            String emailAddr = data.getStringExtra(EmailAddressList.EXTRA_EMAIL_ADDRESS);
             if (requestCode == CONTACT_PICKER_TO2) {
                 addAddress(mToView, new Address(emailAddr, ""));
             } else if (requestCode == CONTACT_PICKER_CC2) {
                 addAddress(mCcView, new Address(emailAddr, ""));
             } else if (requestCode == CONTACT_PICKER_BCC2) {
                 addAddress(mBccView, new Address(emailAddr, ""));
-            } else {
-                return;
             }
+            break;
         }
     }