diff --git a/res/layout-land/message_view.xml b/res/layout-land/message_view.xml
index 1655de013..f958a040e 100644
--- a/res/layout-land/message_view.xml
+++ b/res/layout-land/message_view.xml
@@ -38,10 +38,10 @@
                  android:layout_width="0dip"
                  android:layout_height="0dip">
                 <View 
-                     android:id="@+id/previous"
+                     android:id="@+id/moveToNewer"
                      android:layout_width="0dip"
                      android:layout_height="0dip" />
-                <View android:id="@+id/next"
+                <View android:id="@+id/moveToOlder"
                       android:layout_width="0dip"
                       android:layout_height="0dip" />
             </FrameLayout>
diff --git a/tests/src/com/android/email/activity/MessageViewTests.java b/tests/src/com/android/email/activity/MessageViewTests.java
index 217b2580e..c13162488 100644
--- a/tests/src/com/android/email/activity/MessageViewTests.java
+++ b/tests/src/com/android/email/activity/MessageViewTests.java
@@ -144,8 +144,8 @@ public class MessageViewTests
         a.onClick(a.findViewById(R.id.reply));
         a.onClick(a.findViewById(R.id.reply_all));
         a.onClick(a.findViewById(R.id.delete));
-        a.onClick(a.findViewById(R.id.next));
-        a.onClick(a.findViewById(R.id.previous));
+        a.onClick(a.findViewById(R.id.moveToOlder));
+        a.onClick(a.findViewById(R.id.moveToNewer));
 //      a.onClick(a.findViewById(R.id.download));    // not revealed yet, so unfair test
 //      a.onClick(a.findViewById(R.id.view));        // not revealed yet, so unfair test
         a.onClick(a.findViewById(R.id.show_pictures));