diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index c610e3dc5..61b635c85 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -162,9 +162,12 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         commentField.addTextChangedListener(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
-                commentButton.setVisibility((s.length() > 0 || pendingCommentPicture != null) ? View.VISIBLE : View.GONE);
-                timerView.setVisibility((s.length() > 0 || pendingCommentPicture != null) ? View.GONE : View.VISIBLE);
+                commentButton.setVisibility((s.length() > 0 || pendingCommentPicture != null) ? View.VISIBLE
+                        : View.GONE);
+                timerView.setVisibility((s.length() > 0 || pendingCommentPicture != null) ? View.GONE
+                        : View.VISIBLE);
             }
+
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 //
@@ -221,11 +224,10 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             notes.setPadding(5, 10, 5, 10);
             Linkify.addLinks(notes, Linkify.ALL);
         }
+
         //TODO add loading text back in
         //        loadingText = (TextView) findViewById(R.id.loading);
         loadingText = new TextView(getContext());
-
-
     }
 
     private void setUpListAdapter() {
@@ -252,7 +254,9 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 Update update = new Update();
                 for(updates.moveToFirst(); !updates.isAfterLast(); updates.moveToNext()) {
                     update.readFromCursor(updates);
-                    items.add(NoteOrUpdate.fromUpdate(update));
+                    NoteOrUpdate noa = NoteOrUpdate.fromUpdate(update);
+                    if(noa != null)
+                        items.add(noa);
                 }
             } finally {
                 updates.close();
@@ -509,6 +513,10 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 description += " " + message;
             else
                 description = message;
+
+            if(TextUtils.isEmpty(description))
+                return null;
+
             String commentPicture = u.getValue(Update.PICTURE);
 
             return new NoteOrUpdate(user.optString("picture"),
@@ -565,8 +573,8 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             }
         };
 
-        return (ActFmCameraModule.activityResult((Activity)getContext(), requestCode, resultCode, data, callback));
-        //Handled
+        return (ActFmCameraModule.activityResult((Activity)getContext(),
+                requestCode, resultCode, data, callback));
     }
 
 }
diff --git a/astrid/res/drawable/custom_tab_indicator_dark_selected.9.png b/astrid/res/drawable/custom_tab_indicator_dark_selected.9.png
index 4a5ff4d15..1046299fa 100644
Binary files a/astrid/res/drawable/custom_tab_indicator_dark_selected.9.png and b/astrid/res/drawable/custom_tab_indicator_dark_selected.9.png differ
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 544f9fb56..5bf316a5c 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -70,7 +70,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:orientation="vertical"
-                android:visibility="gone" >
+                android:visibility="gone">
 -                 
 
                 <TextView
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index d97014be9..442001d2b 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -351,10 +351,9 @@
     
     <style name="CustomTabPageIndicator" parent="Widget.TabPageIndicator">
         <item name="android:background">?attr/asEditTabBackground</item>
-        <item name="android:textColor">#FFFF00FF</item>
     </style>
     <style name="CustomTabPageIndicator.Text" parent="Widget.TabPageIndicator.Text">
-        <item name="android:textColor">#FF00FF00</item>
+        <item name="android:textColor">?attr/asTextColor</item>                                                                                                                                                              
         <item name="android:textSize">15sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:layout_marginLeft">5dip</item>
diff --git a/viewPagerIndicator/library/res/layout/vpi__tab.xml b/viewPagerIndicator/library/res/layout/vpi__tab.xml
index 08ba831f9..2f563d7f9 100755
--- a/viewPagerIndicator/library/res/layout/vpi__tab.xml
+++ b/viewPagerIndicator/library/res/layout/vpi__tab.xml
@@ -8,5 +8,6 @@
         android:id="@android:id/text1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        style="?attr/vpiTabTextStyle"
         android:gravity="center" />
 </view>
\ No newline at end of file