diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 5d3181eb4..7bf2fb51c 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    android:id="@+id/message_view_wrapper"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
     <include layout="@layout/message"/>
-    
+
     <include layout="@layout/message_view_move_buttons"/>
-    
+
     <include layout="@layout/message_view_bottom_buttons"/>
 
 </LinearLayout>
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 1ccbb8500..1ffb9586e 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -37,7 +37,6 @@ public class MessageView extends K9Activity implements OnClickListener {
     private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
     private static final int ACTIVITY_CHOOSE_DIRECTORY = 3;
 
-    private View mTopView;
     private SingleMessageView mMessageView;
 
     private PgpData mPgpData;
@@ -293,7 +292,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.message_view);
 
-        mTopView = findViewById(R.id.message_view_wrapper);
         mMessageView = (SingleMessageView) findViewById(R.id.message_view);
 
         //set a callback for the attachment view. With this callback the attachmentview
@@ -737,7 +735,7 @@ public class MessageView extends K9Activity implements OnClickListener {
         mLastDirection = NEXT;
         disableButtons();
         if (K9.showAnimations()) {
-            mTopView.startAnimation(outToLeftAnimation());
+            mMessageView.startAnimation(outToLeftAnimation());
         }
         displayMessage(mNextMessage);
         mNext.requestFocus();
@@ -752,7 +750,7 @@ public class MessageView extends K9Activity implements OnClickListener {
         mLastDirection = PREVIOUS;
         disableButtons();
         if (K9.showAnimations()) {
-            mTopView.startAnimation(inFromRightAnimation());
+            mMessageView.startAnimation(inFromRightAnimation());
         }
         displayMessage(mPreviousMessage);
         mPrevious.requestFocus();