diff --git a/res/layout/task_list_row.xml b/res/layout/task_list_row.xml
index d9f83650a..435551dd2 100644
--- a/res/layout/task_list_row.xml
+++ b/res/layout/task_list_row.xml
@@ -29,7 +29,7 @@
         android:singleLine="true"/>
         
     <TextView android:id="@+id/text2"
-        android:layout_height="fill_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
         android:layout_width="fill_parent"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:gravity="center_vertical"
diff --git a/src/com/timsu/astrid/activities/TaskEdit.java b/src/com/timsu/astrid/activities/TaskEdit.java
index 3ff90ba31..f63b49a1c 100644
--- a/src/com/timsu/astrid/activities/TaskEdit.java
+++ b/src/com/timsu/astrid/activities/TaskEdit.java
@@ -151,7 +151,7 @@ public class TaskEdit extends TaskModificationActivity<TaskModelForEdit> {
                     if(!tagsMap.containsKey(id))
                         continue;
 
-                    TagModelForView tag = tagsMap.get(id.getId());
+                    TagModelForView tag = tagsMap.get(id);
                     addTag(tag.getName());
                 }
             }