diff --git a/astrid/res/layout/task_adapter_draggable_row.xml b/astrid/res/layout/task_adapter_draggable_row.xml
deleted file mode 100644
index d354da823..000000000
--- a/astrid/res/layout/task_adapter_draggable_row.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- See the file "LICENSE" for the full license governing this code. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="57dip"
-    android:paddingTop="2dip"
-    android:paddingBottom="2dip"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-    
-    <View
-        android:id="@+id/importance_legacy"
-        android:layout_width="4dip"
-        android:layout_height="fill_parent"
-        android:visibility="gone" />
-        
-    <!-- indent -->
-    <View android:id="@+id/indent"
-        android:layout_width="0dip"
-        android:layout_height="fill_parent"/>
-    
-    <!-- grabber -->
-    <ImageView android:id="@+id/grabber"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:scaleType="center"
-        android:src="@drawable/grabber"/>
-
-    <RelativeLayout android:id="@+id/rowBody" 
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@android:drawable/list_selector_background"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:paddingLeft="5dip">        
-                
-        
-        <com.todoroo.astrid.ui.CheckableImageView
-	        android:id="@+id/completeBox"
-	        android:layout_width="45dip"
-	        android:layout_height="wrap_content"
-	        android:minHeight="30dip"
-	        android:scaleType="center"
-	        android:layout_alignParentTop="true"
-	        android:layout_marginLeft="2dip"
-	        android:button="@drawable/btn_check" />
-    <!-- assignee photo -->
-
-	    <com.todoroo.astrid.helper.AsyncImageView
-	        android:id="@+id/picture"
-	        android:layout_width="35dip"
-	        android:layout_height="35dip"
-	        android:layout_marginLeft="10dip"
-	        astrid:defaultSrc="@drawable/icn_default_person_image"
-	        android:scaleType="fitCenter"
-	        android:visibility="gone" />
-            
-        <LinearLayout
-	        android:id="@+id/task_row"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_toRightOf="@id/completeBox"
-	        android:layout_centerVertical="true"
-	        android:orientation="horizontal"
-	        android:gravity="center_vertical"
-	        android:paddingLeft="5dip" >
-
-	        <!-- task name -->
-	
-	        <TextView
-	            android:id="@+id/title"
-	            style="@style/TextAppearance.TAd_ItemTitle"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_weight="100"
-	            android:gravity="center_vertical"
-	            android:maxLines="2" />
-	
-	        <!-- due date -->
-	        <LinearLayout
-                android:id="@+id/taskActionContainer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:minHeight="40dip"
-                android:layout_marginRight="4dip"
-                android:orientation="vertical"
-                android:gravity="right|center_vertical">
-                <TextView
-	                android:id="@+id/dueDate"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_alignParentRight="true"
-	                android:layout_marginRight="4dip"
-	                android:gravity="center_vertical|right" />
-                <ImageView
-                    android:id="@+id/taskActionIcon"
-                    android:layout_width="20dip"
-                    android:layout_height="20dip"
-                    android:scaleType="fitCenter"
-                    android:visibility="gone"/>
-            </LinearLayout>
-        </LinearLayout>
-          
-        <!-- details line 1 -->
-        <TextView android:id="@+id/details1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/task_row"
-            android:layout_alignParentLeft="true"
-            android:layout_marginTop="-1dip"
-            style="@style/TextAppearance.TAd_ItemDetails"
-            android:visibility="gone" />
-          
-        <!-- details line 2 -->
-        <TextView android:id="@+id/details2"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/details1"
-            android:layout_alignParentLeft="true"
-            style="@style/TextAppearance.TAd_ItemDetails"
-            android:visibility="gone" />
-            
-    </RelativeLayout>
-    
-</LinearLayout>
diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index bbdb2c1de..80315380c 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -2267,7 +2267,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index 7a25c32ac..6cab57175 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -2257,7 +2257,7 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml
index b4bd65350..0c32b4380 100644
--- a/astrid/res/values-da/strings.xml
+++ b/astrid/res/values-da/strings.xml
@@ -2262,7 +2262,7 @@ Error Message: %s
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index b8f6cc96d..3f51b0498 100644
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -2251,7 +2251,7 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index e3c6df9e6..a1e497d11 100644
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -2261,7 +2261,7 @@ File %1$s contained %2$s.\n\n
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index 1dbc39a90..361320eff 100644
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -2254,7 +2254,7 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-he/strings.xml b/astrid/res/values-he/strings.xml
index ef8357391..75057a087 100644
--- a/astrid/res/values-he/strings.xml
+++ b/astrid/res/values-he/strings.xml
@@ -2285,7 +2285,7 @@ Error Message: %s
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 247241da6..f7ea38345 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -2255,7 +2255,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index a472df895..1b2f29ee2 100644
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -2268,7 +2268,7 @@ Error Message: %s
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index 93282bb01..51346a607 100644
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -2262,7 +2262,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index e3a616c62..10c18e2ce 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -2258,7 +2258,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 79dd72096..7e9fbe6bb 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -2242,7 +2242,7 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index bae19d87d..43f7dbb98 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -2254,7 +2254,7 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
index eee4ff36f..9355b968d 100644
--- a/astrid/res/values-pt-rBR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -2254,7 +2254,7 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index ebb188fed..15af81f0b 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -2275,7 +2275,7 @@ Error Message: %s
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index f37f8fb6a..f17405be6 100644
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -2254,7 +2254,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index 77d11b5e0..dc9bbfd3b 100644
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -2254,7 +2254,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml
index db920080f..fb9729941 100644
--- a/astrid/res/values-th/strings.xml
+++ b/astrid/res/values-th/strings.xml
@@ -2283,7 +2283,7 @@ Error Message: %s
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index d465a9a18..041a7ba69 100644
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -2237,7 +2237,7 @@
   <string name="tag_case_migration_notice">Farklı büyük harflere sahip aynı isimli listeler olduğunu farkettik. Belki de aynı isimli olması gerekir diye bunları birleştirdik. Merak etme, orjinallere birşey olmadı, sadece isimleri değişti. (Alışveriş listesi_1,Alışveriş listesi_2 vb) İstediğin bu değilse tek yapman gereken birleşmiş listeyi silmek!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Ayarlar: %s</string>
+  <string name="tag_settings_title">Ayarlar: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Etkinlik: %s</string>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index fb1f86d54..0b31640f3 100644
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -2242,7 +2242,7 @@
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index 143fc8fef..75e7c030c 100644
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -2255,7 +2255,7 @@ Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
   can simply delete the new combined list!</string>
   
   <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings: %s</string>
+  <string name="tag_settings_title">Settings: </string>
   
   <!-- Header for tag activity -->
   <string name="tag_updates_title">Activity: %s</string>
diff --git a/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java b/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
index b1d436805..a21732e4f 100644
--- a/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
+++ b/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
@@ -7,10 +7,12 @@ import android.graphics.Bitmap;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
-
-/*
- * Subclass of greendroid.widget.AsyncImageView, so that we can cache the image locally when user is offline
- * IMPORTANT: cannot load a cached image by setting the url in an xml file. --ImageDiskCache object is created after object is loaded from xml
+/**
+ * Subclass of greendroid.widget.AsyncImageView, so that we can cache the image
+ * locally when user is offline
+ *
+ * IMPORTANT: cannot load a cached image by setting the url in an xml file.
+ * ImageDiskCache object is created after object is loaded from xml
  */
 public class AsyncImageView extends greendroid.widget.AsyncImageView {