diff --git a/res/layout/mailbox_list_item.xml b/res/layout/mailbox_list_item.xml
index 751109789..d4e28c2a3 100644
--- a/res/layout/mailbox_list_item.xml
+++ b/res/layout/mailbox_list_item.xml
@@ -17,7 +17,7 @@
 <!-- extends RelativeLayout  -->
 <!--
   NOTE: Don't set padding for this.
-  Background of this view will be changed by code, which resets padding.
+  Background of this view will be changed by code for D&D, which resets padding.
 -->
 <com.android.email.activity.MailboxListItem
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
index 3a36473ad..3f83dd252 100644
--- a/res/values-xlarge/colors.xml
+++ b/res/values-xlarge/colors.xml
@@ -16,10 +16,5 @@
 
 <!-- Specializations for xlarge screens - most colors are in values/colors.xml -->
 <resources>
-
     <color name="message_view_fogged_glass_color">#00000000</color>
-
-    <!-- Standard text colors -->
-    <color name="text_primary_color">#000000</color>
-    <color name="text_secondary_color">#666666</color>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ed941f128..32b98f8b1 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -29,7 +29,7 @@
     <color name="connection_error_banner">#fffff1a8</color>
 
     <!-- Standard text colors -->
-    <color name="text_primary_color">#ffffff</color>
+    <color name="text_primary_color">#000000</color>
     <color name="text_secondary_color">#666666</color>
     <color name="text_ternary_color">#888888</color>
 
diff --git a/src/com/android/email/activity/MailboxList.java b/src/com/android/email/activity/MailboxList.java
index 0e040135c..9e97c241f 100644
--- a/src/com/android/email/activity/MailboxList.java
+++ b/src/com/android/email/activity/MailboxList.java
@@ -44,6 +44,9 @@ import android.view.Window;
 import android.view.animation.AnimationUtils;
 import android.widget.TextView;
 
+// TODO: This has a lot in common with MessageList --should we merge them somehow?
+// But maybe we'll need to move to a single activity style anyway -- let's not worry about it too
+// much for now.  We might even completely ditch this activity and switch to a dialog.
 public class MailboxList extends Activity implements MailboxListFragment.Callback {
 
     // Intent extras (internal to this activity)
@@ -155,7 +158,6 @@ public class MailboxList extends Activity implements MailboxListFragment.Callbac
             finish();
             return;
         }
-        // TODO: may need to clear notifications here
     }
 
     @Override