diff --git a/res/menu/message_list_xl_option.xml b/res/menu/message_list_xl_option.xml
index 9f2e95fc5..2ae5577bf 100644
--- a/res/menu/message_list_xl_option.xml
+++ b/res/menu/message_list_xl_option.xml
@@ -31,4 +31,8 @@
         android:title="@string/account_settings_action"
         android:icon="@android:drawable/ic_menu_preferences"
     />
+    <!-- STOPSHIP: Dev version only.  Remove this. -->
+    <item android:id="@+id/change_orientation"
+        android:title="@string/menu_change_orientation"
+    />
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index df3948f0b..16235b89c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -719,5 +719,7 @@
     <string name="activity_label_2pane">Email 2 Pane</string>
     <!-- Do Not Translate.  STOPSHIP: Dev version only.  Remove this. -->
     <string name="activity_label_1pane">Email 1 Pane</string>
+    <!-- Do Not Translate.  STOPSHIP: Dev version only.  Remove this. -->
+    <string name="menu_change_orientation">Change orientation</string>
 
 </resources>
diff --git a/src/com/android/email/Utility.java b/src/com/android/email/Utility.java
index ea7136465..4112c5fdf 100644
--- a/src/com/android/email/Utility.java
+++ b/src/com/android/email/Utility.java
@@ -29,6 +29,7 @@ import com.android.email.provider.EmailContent.MessageColumns;
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.database.Cursor;
@@ -843,4 +844,15 @@ public class Utility {
             lv.onRestoreInstanceState(mState);
         }
     }
+
+    /**
+     * STOPSHIP Remove this method
+     * Toggle between portrait and landscape.  Developement use only.
+     */
+    public static void changeOrientation(Activity activity) {
+        activity.setRequestedOrientation(
+                (activity.getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+                ? ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+    }
 }
diff --git a/src/com/android/email/activity/MessageListXL.java b/src/com/android/email/activity/MessageListXL.java
index 698b643d1..975744686 100644
--- a/src/com/android/email/activity/MessageListXL.java
+++ b/src/com/android/email/activity/MessageListXL.java
@@ -18,6 +18,7 @@ package com.android.email.activity;
 
 import com.android.email.Email;
 import com.android.email.R;
+import com.android.email.Utility;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -26,7 +27,6 @@ import android.app.LoaderManager.LoaderCallbacks;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Loader;
-import android.content.pm.ActivityInfo;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.util.Log;
@@ -433,6 +433,10 @@ public class MessageListXL extends Activity implements View.OnClickListener,
             case R.id.account_settings:
                 // TODO Implement this
                 return true;
+                // STOPSHIP remove this
+                case R.id.change_orientation:
+                Utility.changeOrientation(this);
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -452,10 +456,7 @@ public class MessageListXL extends Activity implements View.OnClickListener,
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_R) {
-            setRequestedOrientation(
-                    (getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
-                    ? ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-                    : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            Utility.changeOrientation(this);
             return true;
         }
         return super.onKeyDown(keyCode, event);