diff --git a/res/anim/slide_in_left.xml b/res/anim/slide_in_left.xml
index 21834d200..8c0ea086c 100644
--- a/res/anim/slide_in_left.xml
+++ b/res/anim/slide_in_left.xml
@@ -1,13 +1,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <translate
-        android:duration="200"
-        android:fromXDelta="-50%p"
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="-100%p"
         android:toXDelta="0" />
 
-    <alpha
-        android:duration="200"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_in_right.xml b/res/anim/slide_in_right.xml
index 5eb0f6b18..f830d3f77 100644
--- a/res/anim/slide_in_right.xml
+++ b/res/anim/slide_in_right.xml
@@ -1,13 +1,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <translate
-        android:duration="200"
-        android:fromXDelta="50%p"
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="100%p"
         android:toXDelta="0" />
 
-    <alpha
-        android:duration="200"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0" />
-
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_out_left.xml b/res/anim/slide_out_left.xml
index 6d9636735..f672b190c 100644
--- a/res/anim/slide_out_left.xml
+++ b/res/anim/slide_out_left.xml
@@ -1,13 +1,8 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <translate
-        android:duration="200"
+        android:duration="@android:integer/config_mediumAnimTime"
         android:fromXDelta="0"
-        android:toXDelta="-50%p" />
-
-    <alpha
-        android:duration="200"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
+        android:toXDelta="-100%p" />
 
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_out_right.xml b/res/anim/slide_out_right.xml
index 1fafb2534..fd89cad27 100644
--- a/res/anim/slide_out_right.xml
+++ b/res/anim/slide_out_right.xml
@@ -1,13 +1,9 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <translate
-        android:duration="200"
+        android:duration="@android:integer/config_mediumAnimTime"
         android:fromXDelta="0"
-        android:toXDelta="50%p" />
+        android:toXDelta="100%p" />
 
-    <alpha
-        android:duration="200"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
 
 </set>
\ No newline at end of file
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 57457acb4..95c733d51 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -200,7 +200,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         } else {
             setContentView(R.layout.message_list);
             mViewSwitcher = (ViewSwitcher) findViewById(R.id.container);
-            mViewSwitcher.setAnimateFirstView(false);
+            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));
@@ -1356,13 +1356,12 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
     private void showMessageList() {
         mMessageListWasDisplayed = true;
         mDisplayMode = DisplayMode.MESSAGE_LIST;
-
         mViewSwitcher.showFirstView();
 
-        removeMessageViewFragment();
         mMessageListFragment.setActiveMessage(null);
 
         showDefaultTitleView();
+        removeMessageViewFragment();
     }
 
     private void showMessageView() {