diff --git a/res/layout-land/message_view.xml b/res/layout-land/message_view.xml
index 92541fc37..1655de013 100644
--- a/res/layout-land/message_view.xml
+++ b/res/layout-land/message_view.xml
@@ -21,6 +21,7 @@
     android:layout_height="fill_parent"
     android:background="@android:color/white">
     <ScrollView
+        android:id="@+id/scrollview"
         android:layout_width="fill_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 1687f2a27..65f7504cb 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -21,6 +21,7 @@
     android:layout_height="fill_parent"
     android:background="@android:color/white">
     <ScrollView
+        android:id="@+id/scrollview"
         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 2a86fcd5e..fedb33b9a 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -123,6 +123,7 @@ public class MessageView extends Activity implements OnClickListener {
     private View mShowPicturesSection;
     private ImageView mSenderPresenceView;
     private ProgressDialog mProgressDialog;
+    private View mScrollView;
 
     private long mAccountId;
     private long mMessageId;
@@ -332,6 +333,7 @@ public class MessageView extends Activity implements OnClickListener {
         mSenderPresenceView = (ImageView) findViewById(R.id.presence);
         mNext = findViewById(R.id.next);
         mPrevious = findViewById(R.id.previous);
+        mScrollView = findViewById(R.id.scrollview);
 
         mNext.setOnClickListener(this);
         mPrevious.setOnClickListener(this);
@@ -770,6 +772,7 @@ public class MessageView extends Activity implements OnClickListener {
             mMessageContentView.scrollTo(0, 0);
             mMessageContentView.loadUrl("file:///android_asset/empty.html");
         }
+        mScrollView.scrollTo(0, 0);
         mAttachments.removeAllViews();
         mAttachments.setVisibility(View.GONE);
         mAttachmentIcon.setVisibility(View.GONE);