diff --git a/res/menu/message_list_xl_option.xml b/res/menu/message_list_xl_option.xml
index 2ae5577bf..4af504087 100644
--- a/res/menu/message_list_xl_option.xml
+++ b/res/menu/message_list_xl_option.xml
@@ -32,6 +32,11 @@
         android:icon="@android:drawable/ic_menu_preferences"
     />
     <!-- STOPSHIP: Dev version only.  Remove this. -->
+    <item android:id="@+id/add_new_account"
+        android:title="@string/add_account_action"
+        android:icon="@android:drawable/ic_menu_add"
+    />
+    <!-- STOPSHIP: Dev version only.  Remove this. -->
     <item android:id="@+id/change_orientation"
         android:title="@string/menu_change_orientation"
     />
diff --git a/src/com/android/email/activity/MessageListXL.java b/src/com/android/email/activity/MessageListXL.java
index 230dbb490..a0905bebb 100644
--- a/src/com/android/email/activity/MessageListXL.java
+++ b/src/com/android/email/activity/MessageListXL.java
@@ -19,6 +19,8 @@ package com.android.email.activity;
 import com.android.email.Email;
 import com.android.email.R;
 import com.android.email.Utility;
+import com.android.email.activity.setup.AccountSettings;
+import com.android.email.activity.setup.AccountSetupBasics;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -449,12 +451,12 @@ public class MessageListXL extends Activity implements View.OnClickListener,
                 // TODO Implement this
                 return true;
             case R.id.account_settings:
-                // TODO Implement this
-                return true;
-                // STOPSHIP remove this
-                case R.id.change_orientation:
+                return onAccountSettings();
+            case R.id.change_orientation: // STOPSHIP remove this
                 Utility.changeOrientation(this);
                 return true;
+            case R.id.add_new_account: // STOPSHIP remove this
+                return onAddNewAccount();
         }
         return super.onOptionsItemSelected(item);
     }
@@ -467,6 +469,19 @@ public class MessageListXL extends Activity implements View.OnClickListener,
         return true;
     }
 
+    private boolean onAccountSettings() {
+        if (!mFragmentManager.isAccountSelected()) {
+            return false; // this shouldn't really happen
+        }
+        AccountSettings.actionSettings(this, mFragmentManager.getAccountId());
+        return true;
+    }
+
+    private boolean onAddNewAccount() {
+        AccountSetupBasics.actionNewAccount(this);
+        return true;
+    }
+
     /**
      * STOPSHIP: Remove this.
      * Rotate screen when the R key is pressed.  Workaround for auto-orientation not working.