diff --git a/src/com/android/email/activity/MailboxFragmentAdapter.java b/src/com/android/email/activity/MailboxFragmentAdapter.java
index 3c4766ae1..bc36e7359 100644
--- a/src/com/android/email/activity/MailboxFragmentAdapter.java
+++ b/src/com/android/email/activity/MailboxFragmentAdapter.java
@@ -89,7 +89,6 @@ class MailboxFragmentAdapter extends CursorAdapter {
     private static final int ROW_TYPE_MAILBOX = 0;
     /** Account "mailboxes" in the combined view */
     private static final int ROW_TYPE_ACCOUNT = 1;
-    // STOPSHIP Need to determine if these types are sufficient for nested folders
     // The following types are used when drilling into a mailbox
     /** The current mailbox */
     private static final int ROW_TYPE_CURMAILBOX = 2;
@@ -114,7 +113,6 @@ class MailboxFragmentAdapter extends CursorAdapter {
             MailboxColumns.DISPLAY_NAME, MailboxColumns.TYPE, MailboxColumns.UNREAD_COUNT,
             MailboxColumns.MESSAGE_COUNT, ROW_TYPE_MAILBOX + " AS " + ROW_TYPE,
             MailboxColumns.FLAGS, MailboxColumns.ACCOUNT_KEY };
-    // STOPSHIP May need to adjust sub-folder projection depending upon final UX
     /**
      * Projection used to retrieve immediate children for a mailbox. The columns need to
      * be identical to those in {@link #PROJECTION}. We are only changing the constant
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index afa8cad5c..bd2f4b30a 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -1714,10 +1714,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             createAndAddTab(R.string.forward_action, ACTION_FORWARD);
 
             actionBar.setDisplayShowTitleEnabled(false);
-            try { // STOPSHIP workaround b/4520517
-                actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-            } catch (RuntimeException ignore) {
-            }
+            actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
         } else {
             // Spinner based mode switching.
             if (mActionSpinnerAdapter == null) {
@@ -1727,7 +1724,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
                     @Override
                     public void onItemSelected(
                             AdapterView<?> parent, View view, int position, long id) {
-                        setAction(mActionSpinnerAdapter.getAction(position));
+                        setAction(ActionSpinnerAdapter.getAction(position));
                     }
 
                     @Override