diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 63f3cc084..eb27ca79c 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -64,7 +64,7 @@
                         android:layout_height="wrap_content"
                         android:text="@{daily.text}" />
                     <TextView
-                        android:id="@+id/textView6"
+                        android:id="@+id/notesTextView"
                         style="@style/CardText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index c90d2e66f..5fc74041a 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -66,7 +66,7 @@
                         android:text="@{habit.text}" />
 
                     <TextView
-                        android:id="@+id/textView6"
+                        android:id="@+id/notesTextView"
                         style="@style/CardText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index cabed9d6a..6084ce68e 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -63,7 +63,7 @@
                             android:text="@{reward.text}" />
 
                         <TextView
-                            android:id="@+id/textView6"
+                            android:id="@+id/notesTextView"
                             style="@style/CardText"
                             android:layout_width="wrap_content"
                             android:layout_height="41dp"
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index cd29ee7cc..65a2efb70 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -54,7 +54,7 @@
                         android:text="@{todo.text}" />
 
                     <TextView
-                        android:id="@+id/textView6"
+                        android:id="@+id/notesTextView"
                         style="@style/CardText"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
index 68091ced7..280036b22 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -176,9 +176,10 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
     @Override
     public long getItemId(int position) {
         Task task = filteredObservableContent.get(position);
-        UUID uuid = new UUID(0, 0).fromString(task.getId());
-
-        return uuid.getMostSignificantBits();
+        if (task.getId() != null && task.getId().length() == 36) {
+            return UUID.fromString(task.getId()).getMostSignificantBits();
+        }
+        return UUID.randomUUID().getMostSignificantBits();
     }
 
     @Override
@@ -248,6 +249,9 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
 
         public THabitItem Item;
 
+        @InjectView(R.id.notesTextView)
+        TextView notesTextView;
+
         public ViewHolder(View itemView) {
             super(itemView);
 
@@ -265,6 +269,11 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
         public void bindHolder(THabitItem habitItem, int position) {
             double itemvalue = habitItem.getValue();
             Item = habitItem;
+            if (habitItem.notes.length() == 0) {
+                notesTextView.setHeight(0);
+            } else {
+                notesTextView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+            }
         }
 
         @Override