diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 2be31f1a1..a055af1d9 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1797,7 +1797,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         case CONTACT_PICKER_TO:
         case CONTACT_PICKER_CC:
         case CONTACT_PICKER_BCC:
-            ContactItem contact = mContacts.getEmailFromContactPicker(data);
+            ContactItem contact = mContacts.extractInfoFromContactPickerIntent(data);
             if (contact == null) {
                 Toast.makeText(this, getString(R.string.error_contact_address_not_found), Toast.LENGTH_LONG).show();
                 return;
diff --git a/src/com/fsck/k9/helper/Contacts.java b/src/com/fsck/k9/helper/Contacts.java
index b10e882c5..e0d5ac794 100644
--- a/src/com/fsck/k9/helper/Contacts.java
+++ b/src/com/fsck/k9/helper/Contacts.java
@@ -183,7 +183,7 @@ public abstract class Contacts {
      * @return A {@link ContactItem} instance describing the picked contact. Or {@code null} if the
      *         contact doesn't have any email addresses.
      */
-    public abstract ContactItem getEmailFromContactPicker(final Intent intent);
+    public abstract ContactItem extractInfoFromContactPickerIntent(final Intent intent);
 
     /**
      * Does the device actually have a Contacts application suitable for
diff --git a/src/com/fsck/k9/helper/ContactsSdk5.java b/src/com/fsck/k9/helper/ContactsSdk5.java
index 027b839d7..e1f92f498 100644
--- a/src/com/fsck/k9/helper/ContactsSdk5.java
+++ b/src/com/fsck/k9/helper/ContactsSdk5.java
@@ -193,7 +193,7 @@ public class ContactsSdk5 extends com.fsck.k9.helper.Contacts {
     }
 
     @Override
-    public ContactItem getEmailFromContactPicker(final Intent data) {
+    public ContactItem extractInfoFromContactPickerIntent(final Intent data) {
         Cursor cursor = null;
         ArrayList<String> email = new ArrayList<String>();