diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 13b90ba88..9c63fcbec 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -205,6 +205,8 @@
   <string name="p_useLegacyImportanceStyle">legacyImportanceStyle</string>
   
   <string name="p_taskRowPrefs">taskRowPrefs</string>
+  
+  <string name="p_fullTaskTitle">fullTaskTitle</string>
   <!-- ========================================================= DEFAULTS == -->
   
   <!-- default urgency setting (corresponds to entry in TEA_urgency) -->  
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index de9e46e4e..4dd67da8a 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -485,6 +485,11 @@
   <string name="EPr_userLegacyImportance_title">Use legacy importance style</string>
   <string name="EPr_userLegacyImportance_desc">Use legacy importance style</string>
   
+  <!-- Preferences: Wrap task titles to two lines -->
+  <string name="EPr_fullTask_title">Show full task title</string>
+  <string name="EPr_fullTask_desc_enabled">Full task title will be shown</string>
+  <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
+  
   <!-- Preference: Theme -->
   <string name="EPr_theme_title">Color Theme</string>
   <!-- Preference: Theme Description (%s => value) -->
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index f59c44211..7e3a9f5a5 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -18,6 +18,11 @@
 	            android:title="@string/EPr_fontSize_title"
 	            android:summary="@string/EPr_fontSize_desc" />
 	        
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_fullTaskTitle"
+	            android:title="@string/EPr_fullTask_title"
+	            android:defaultValue="false" />
+	        
 	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
 	            android:key="@string/p_showNotes"
 	            android:title="@string/EPr_showNotes_title"
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 9371fd90f..876dc7f2d 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -291,6 +291,11 @@ public class EditPreferences extends TodorooPreferenceActivity {
                 taskService.clearDetails(Criterion.all);
                 Flags.set(Flags.REFRESH);
             }
+        } else if(r.getString(R.string.p_fullTaskTitle).equals(preference.getKey())) {
+            if (value != null && (Boolean) value)
+                preference.setSummary(R.string.EPr_fullTask_desc_enabled);
+            else
+                preference.setSummary(R.string.EPr_fullTask_desc_disabled);
         } else if (r.getString(R.string.p_theme).equals(preference.getKey())) {
             if(AndroidUtilities.getSdkVersion() < 5) {
                 preference.setEnabled(false);
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index f32547dfb..b96ff5aa7 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -279,17 +279,18 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         viewHolder.taskActionContainer = view.findViewById(R.id.taskActionContainer);
         viewHolder.taskActionIcon = (ImageView)view.findViewById(R.id.taskActionIcon);
 
-
-        if (Preferences.getBoolean(R.string.p_showNotes, false)) {
+        boolean showFullTaskTitle = Preferences.getBoolean(R.string.p_fullTaskTitle, false);
+        boolean showNotes = Preferences.getBoolean(R.string.p_showNotes, false);
+        if (showFullTaskTitle) {
             viewHolder.nameView.setMaxLines(Integer.MAX_VALUE);
-            LayoutParams containerParams = view.getLayoutParams();
-            containerParams.height = LayoutParams.WRAP_CONTENT;
-            view.setPadding(view.getPaddingLeft(), 20, view.getPaddingRight(), 20);
-            view.setLayoutParams(containerParams);
+        }
+
+        if (showNotes) {
             RelativeLayout.LayoutParams taskRowParams = (RelativeLayout.LayoutParams)viewHolder.taskRow.getLayoutParams();
             taskRowParams.addRule(RelativeLayout.CENTER_VERTICAL, 0);
         }
 
+
         view.setTag(viewHolder);
         for(int i = 0; i < view.getChildCount(); i++)
             view.getChildAt(i).setTag(viewHolder);