diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index 3355c5169..62efbfdf8 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -66,7 +66,7 @@
 	        <TextView
 	            android:id="@+id/title"
 	            style="@style/TextAppearance.TAd_ItemTitle"
-	            android:layout_width="fill_parent"
+	            android:layout_width="0dip"
 	            android:layout_height="wrap_content"
 	            android:layout_weight="100"
 	            android:gravity="center_vertical"
@@ -85,7 +85,6 @@
 		            android:id="@+id/dueDate"
 		            android:layout_width="wrap_content"
 		            android:layout_height="wrap_content"
-		            android:layout_alignParentRight="true"
 		            android:gravity="center_vertical|right" />
 		        <ImageView
 		            android:id="@+id/taskActionIcon"
diff --git a/astrid/res/layout/task_adapter_row_simple.xml b/astrid/res/layout/task_adapter_row_simple.xml
index f64afaa4b..0851e9e92 100644
--- a/astrid/res/layout/task_adapter_row_simple.xml
+++ b/astrid/res/layout/task_adapter_row_simple.xml
@@ -53,6 +53,7 @@
 	
 	    <LinearLayout
 	        android:id="@+id/task_row"
+	        android:baselineAligned="false"
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
 	        android:layout_marginLeft="52dip"
@@ -64,7 +65,7 @@
 	        <!-- task name -->
 	
 	       <LinearLayout
-	           android:layout_width="fill_parent"
+	           android:layout_width="0dip"
 	           android:layout_height="wrap_content"
                android:layout_weight="100"
 	           android:orientation="vertical"
diff --git a/astrid/res/layout/task_adapter_row_title_only.xml b/astrid/res/layout/task_adapter_row_title_only.xml
index e2cedaedc..94875a87e 100644
--- a/astrid/res/layout/task_adapter_row_title_only.xml
+++ b/astrid/res/layout/task_adapter_row_title_only.xml
@@ -45,7 +45,7 @@
 	        <TextView
 	            android:id="@+id/title"
 	            style="@style/TextAppearance.TAd_ItemTitle"
-	            android:layout_width="fill_parent"
+	            android:layout_width="0dip"
 	            android:layout_height="wrap_content"
 	            android:layout_weight="100"
 	            android:gravity="center_vertical"