diff --git a/res/layout-land/message_view.xml b/res/layout-land/message_view.xml
index 70cc82890..6a01b2996 100644
--- a/res/layout-land/message_view.xml
+++ b/res/layout-land/message_view.xml
@@ -4,8 +4,10 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@android:color/white">
+    android:background="@android:color/white"
+    >
     <ScrollView
+        android:id="@+id/top_view"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="1"
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 3fb07fcb0..f91bac326 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -6,6 +6,7 @@
     android:layout_height="fill_parent"
     >
     <ScrollView
+        android:id="@+id/top_view"
         android:layout_width="fill_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index b2cd2cd86..5f09a7d70 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -49,6 +49,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -97,6 +98,7 @@ public class MessageView extends K9Activity
     private TextView mSubjectView;
     private CheckBox mFlagged;
     private int defaultSubjectColor;
+    private ScrollView mTopView;
     private WebView mMessageContentView;
     private LinearLayout mAttachments;
     private View mAttachmentIcon;
@@ -461,6 +463,7 @@ public class MessageView extends K9Activity
 
         mDateView = (TextView)findViewById(R.id.date);
         mTimeView = (TextView)findViewById(R.id.time);
+        mTopView = (ScrollView)findViewById(R.id.top_view);
         mMessageContentView = (WebView)findViewById(R.id.message_content);
 
         mAttachments = (LinearLayout)findViewById(R.id.attachments);
@@ -609,10 +612,13 @@ public class MessageView extends K9Activity
     private void displayMessage(String uid) {
         mMessageUid = uid;
         mMessageContentView.getSettings().setBlockNetworkImage(true);
+
         mAttachments.removeAllViews();
         findSurroundingMessagesUid();
+
         next.setEnabled(mNextMessageUid != null );
         previous.setEnabled(mPreviousMessageUid != null);
+
         if (next_scrolling != null)
             next_scrolling.setEnabled(mNextMessageUid != null );
         if (previous_scrolling != null)
@@ -623,6 +629,9 @@ public class MessageView extends K9Activity
             mFolder,
             mMessageUid,
             mListener);
+
+        mTopView.scrollTo(0, 0);
+        mMessageContentView.scrollTo(0, 0);
     }