diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 95c733d51..2e940fe4e 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -200,7 +200,6 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         } else {
             setContentView(R.layout.message_list);
             mViewSwitcher = (ViewSwitcher) findViewById(R.id.container);
-            mViewSwitcher.setAnimateFirstView(true);
             mViewSwitcher.setFirstInAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_in_left));
             mViewSwitcher.setFirstOutAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_out_right));
             mViewSwitcher.setSecondInAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_in_right));
@@ -326,6 +325,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 break;
             }
             case MESSAGE_VIEW: {
+                mViewSwitcher.setAnimateFirstView(true);
                 showMessageView();
                 break;
             }