diff --git a/astrid/res/values/strings-legacy.xml b/astrid/res/values/strings-legacy.xml
index 72c77ade0..982aa9bcb 100644
--- a/astrid/res/values/strings-legacy.xml
+++ b/astrid/res/values/strings-legacy.xml
@@ -476,7 +476,7 @@ Skipped %d tasks.\n
         <string name="prefs_backup_desc_success">Latest backup was on %s</string>
 
         <string name="prefs_defaultCalendar_title">Calendar</string>
-        <string name="prefs_defaultCalendar_desc">Calendar to store the events.</string>
+        <string name="prefs_defaultCalendar_desc">Calendar to use for \"Add to Calendar\".</string>
         <string name="prefs_defaultCalendar_astrid_default">Astrid default</string>
 
 
diff --git a/astrid/src-legacy/com/timsu/astrid/utilities/Calendars.java b/astrid/src-legacy/com/timsu/astrid/utilities/Calendars.java
index 3d0a24c16..5e590ba86 100644
--- a/astrid/src-legacy/com/timsu/astrid/utilities/Calendars.java
+++ b/astrid/src-legacy/com/timsu/astrid/utilities/Calendars.java
@@ -30,9 +30,10 @@ public class Calendars {
 
 	// Only show calendars that the user can modify. Access level 500
 	// corresponds to Calendars.CONTRIBUTOR_ACCESS
-	private static final String CALENDARS_WHERE = ACCES_LEVEL_COLUMN_NAME + " >= 500";
+	private static final String CALENDARS_WHERE = ACCES_LEVEL_COLUMN_NAME + ">= 500";
 
-	private static final String CALENDARS_WHERE_ID = ACCES_LEVEL_COLUMN_NAME+" >= 500 AND" + ID_COLUMN_NAME +"=?";
+	private static final String CALENDARS_WHERE_ID = ACCES_LEVEL_COLUMN_NAME+
+	    " >= 500 AND " + ID_COLUMN_NAME +"=?";
 
 	private static final String CALENDARS_SORT = "displayName ASC";