diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 8b411fe47..3cb514e3f 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -526,8 +526,12 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                 ACTION_EDIT_DRAFT.equals(action)) {
             //change focus to message body.
             mMessageContentView.requestFocus();
+        } else {
+            // Explicitly set focus to "To:" input field (see issue 2998)
+            mToView.requestFocus();
         }
 
+
         mEncryptLayout = findViewById(R.id.layout_encrypt);
         mCryptoSignatureCheckbox = (CheckBox)findViewById(R.id.cb_crypto_signature);
         mCryptoSignatureUserId = (TextView)findViewById(R.id.userId);