diff --git a/astrid/res/layout/control_set_notes_display.xml b/astrid/res/layout/control_set_notes_display.xml
index 806771cbf..178782bf1 100644
--- a/astrid/res/layout/control_set_notes_display.xml
+++ b/astrid/res/layout/control_set_notes_display.xml
@@ -9,7 +9,8 @@
   <LinearLayout
       android:id="@+id/notes_body"
       android:layout_width="fill_parent"
-      android:layout_height="50dip"
+      android:minHeight="50dip"
+      android:layout_height="wrap_content"
       android:gravity="center_vertical">
       <ImageView 
         style="@style/EditRowImage"
@@ -26,7 +27,6 @@
 	      android:layout_height="wrap_content"
 	      android:layout_weight="1"
 	      android:gravity="right"
-	      android:maxLines="2"
 	      android:paddingLeft="10dip"
 	      style="@style/TextAppearance.EditRowDisplay" />
 	  <include layout="@layout/task_edit_arrow"/>
diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
index 0f3a7a0c1..5e23f7e00 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
@@ -1,6 +1,9 @@
 package com.todoroo.astrid.ui;
 
 import android.app.Activity;
+import android.graphics.Color;
+import android.text.TextUtils;
+import android.text.util.Linkify;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -21,12 +24,21 @@ public class EditNotesControlSet extends PopupControlSet {
     @Override
     protected void refreshDisplayView() {
         notesPreview.setText(editText.getText());
+        linkifyDisplayView();
+    }
+
+    private void linkifyDisplayView() {
+        if(!TextUtils.isEmpty(notesPreview.getText())) {
+            notesPreview.setLinkTextColor(Color.rgb(100, 160, 255));
+            Linkify.addLinks(notesPreview, Linkify.ALL);
+        }
     }
 
     @Override
     public void readFromTask(Task task) {
         editText.setTextKeepState(task.getValue(Task.NOTES));
         notesPreview.setText(task.getValue(Task.NOTES));
+        linkifyDisplayView();
     }
 
     @Override