diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 24c663917..8832b997e 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -3,6 +3,7 @@
   <component name="ProjectCodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
       <value>
+        <option name="AUTODETECT_INDENTS" value="false" />
         <option name="FIELD_NAME_PREFIX" value="m" />
         <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
         <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
@@ -78,7 +79,6 @@
         <XML>
           <option name="XML_ATTRIBUTE_WRAP" value="2" />
           <option name="XML_KEEP_LINE_BREAKS" value="false" />
-          <option name="XML_KEEP_LINE_BREAKS_IN_TEXT" value="true" />
           <option name="XML_ALIGN_ATTRIBUTES" value="false" />
           <option name="XML_KEEP_WHITE_SPACES_INSIDE_CDATA" value="true" />
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
diff --git a/opentasks-provider/src/main/java/org/dmfs/ngrams/NGramGenerator.java b/opentasks-provider/src/main/java/org/dmfs/ngrams/NGramGenerator.java
index b5ca31212..7889f4af4 100644
--- a/opentasks-provider/src/main/java/org/dmfs/ngrams/NGramGenerator.java
+++ b/opentasks-provider/src/main/java/org/dmfs/ngrams/NGramGenerator.java
@@ -181,13 +181,13 @@ public void getNgrams(String word, Set<String> ngrams)
         {
             /*
              * Add another String with a space and the first n-1 characters of the word.
-			 * 
-			 * We could just call
-			 * 
-			 * ngrams.add(" " + word.substring(0, Math.min(len, n - 1));
-			 * 
-			 * But it's probably way more efficient like this:
-			 */
+             *
+             * We could just call
+             *
+             * ngrams.add(" " + word.substring(0, Math.min(len, n - 1));
+             *
+             * But it's probably way more efficient like this:
+             */
             char[] tempArray = mTempArray;
 
             int count = Math.min(len, n - 1);
diff --git a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskDatabaseHelper.java b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskDatabaseHelper.java
index c48c1157c..2e97b9e56 100644
--- a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskDatabaseHelper.java
+++ b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskDatabaseHelper.java
@@ -40,7 +40,7 @@ public class TaskDatabaseHelper extends SQLiteOpenHelper
 {
 
     /**
-	 * Interface of a listener that's called when the database has been created or migrated.
+     * Interface of a listener that's called when the database has been created or migrated.
      */
     public interface OnDatabaseOperationListener
     {
@@ -112,399 +112,399 @@ public interface CategoriesMapping
     }
 
     // @formatter:off
-	
-	/**
-	 * SQL command to create a view that combines tasks with some data from the list they belong to.
-	 */
-	private final static String SQL_CREATE_TASK_VIEW = "create view " + Tables.TASKS_VIEW + " as select " +
-		Tables.TASKS + ".*, " +
-		Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", " +
-		Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", " +
-		Tables.LISTS + "." + Tasks.LIST_OWNER + ", " +
-		Tables.LISTS + "." + Tasks.LIST_NAME + ", " +
-		Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", " +
-		Tables.LISTS + "." + Tasks.LIST_COLOR + ", " +
-		Tables.LISTS + "." + Tasks.VISIBLE +
-		" from " + Tables.TASKS + " join " + Tables.LISTS +
-		" on (" + Tables.TASKS + "." + Tasks.LIST_ID + "=" + Tables.LISTS + "." + TaskLists._ID + ");";
-
-	/**
-	 * SQL command to create a view that combines tasks with some data from the list they belong to.
-	 */
-	private final static String SQL_CREATE_TASK_PROPERTY_VIEW = "create view " + Tables.TASKS_PROPERTY_VIEW + " as select " +
-		Tables.TASKS + ".*, " +
-		Tables.PROPERTIES + ".*, "+ 
-		Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", " +
-		Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", " +
-		Tables.LISTS + "." + Tasks.LIST_OWNER + ", " +
-		Tables.LISTS + "." + Tasks.LIST_NAME + ", " +
-		Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", " +
-		Tables.LISTS + "." + Tasks.LIST_COLOR + ", " +
-		Tables.LISTS + "." + Tasks.VISIBLE +
-		" from " + Tables.TASKS + " join " + Tables.LISTS +
-		" on (" + Tables.TASKS + "." + Tasks.LIST_ID + "=" + Tables.LISTS + "." + TaskLists._ID + ") "+
-		"left join "+ Tables.PROPERTIES + " on (" + Tables.TASKS + "." + Tasks._ID + "=" + Tables.PROPERTIES + "." + Properties.TASK_ID +");";
-
-
-	/**
-	 * SQL command to drop the task view.
-	 */
-	private final static String SQL_DROP_TASK_VIEW = "DROP VIEW " + Tables.TASKS_VIEW + ";";
-
-	
-	/**
-	 * SQL command to create a view that combines task instances with some data from the list they belong to.
-	 */
-	private final static String SQL_CREATE_INSTANCE_VIEW = "CREATE VIEW " + Tables.INSTANCE_VIEW + " AS SELECT "
-		+ Tables.INSTANCES + ".*, "
-		+ Tables.TASKS + ".*, "
-		+ Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", "
-		+ Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_OWNER + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_NAME + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_COLOR + ", "
-		+ Tables.LISTS + "." + Tasks.VISIBLE
-		+ " FROM " + Tables.TASKS
-		+ " JOIN " + Tables.LISTS + " ON (" + Tables.TASKS + "."+ TaskContract.Tasks.LIST_ID + "=" + Tables.LISTS + "."+TaskContract.Tasks._ID + ")"
-		+ " JOIN " + Tables.INSTANCES + " ON (" + Tables.TASKS + "." + TaskContract.Tasks._ID + "=" + Tables.INSTANCES + "."+TaskContract.Instances.TASK_ID+ ");";
-	
-	
-	/**
-	 * SQL command to create a view that combines task instances view with the belonging properties.
-	 */
-	private final static String SQL_CREATE_INSTANCE_PROPERTY_VIEW = "CREATE VIEW " + Tables.INSTANCE_PROPERTY_VIEW + " AS SELECT "
-		+ Tables.INSTANCES + ".*, "
-		+ Tables.PROPERTIES + ".*, "
-		+ Tables.TASKS + ".*, "
-		+ Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", "
-		+ Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_OWNER + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_NAME + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_COLOR + ", "
-		+ Tables.LISTS + "." + Tasks.VISIBLE
-		+ " FROM " + Tables.TASKS
-		+ " JOIN " + Tables.LISTS + " ON (" + Tables.TASKS + "."+ TaskContract.Tasks.LIST_ID + "=" + Tables.LISTS + "."+TaskContract.Tasks._ID + ")"
-		+ " JOIN " + Tables.INSTANCES + " ON (" + Tables.TASKS + "." + TaskContract.Tasks._ID + "=" + Tables.INSTANCES + "."+TaskContract.Instances.TASK_ID+ ")"
-		+ " LEFT JOIN "+ Tables.PROPERTIES + " ON (" + Tables.TASKS + "." + Tasks._ID + "=" + Tables.PROPERTIES + "." + Properties.TASK_ID +");";
-	
-	
-	/**
-	 * SQL command to create a view that combines task instances with some data from the list they belong to.
-	 */
-	private final static String SQL_CREATE_INSTANCE_CATEGORY_VIEW = "CREATE VIEW " + Tables.INSTANCE_CATEGORY_VIEW + " AS SELECT "
-		+ Tables.INSTANCES + ".*, "
-		+ Tables.CATEGORIES_MAPPING + "." + CategoriesMapping.CATEGORY_ID + ", "
-		+ Tables.TASKS + ".*, "
-		+ Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", "
-		+ Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_OWNER + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_NAME + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", "
-		+ Tables.LISTS + "." + Tasks.LIST_COLOR + ", "
-		+ Tables.LISTS + "." + Tasks.VISIBLE
-		+ " FROM " + Tables.TASKS
-		+ " JOIN " + Tables.LISTS + " ON (" + Tables.TASKS + "."+ TaskContract.Tasks.LIST_ID + "=" + Tables.LISTS + "."+TaskContract.Tasks._ID + ")"
-		+ " JOIN " + Tables.INSTANCES + " ON (" + Tables.TASKS + "." + TaskContract.Tasks._ID + "=" + Tables.INSTANCES + "."+TaskContract.Instances.TASK_ID+ ")"
-		+ " LEFT JOIN " + Tables.CATEGORIES_MAPPING + " ON (" + Tables.CATEGORIES_MAPPING + "." + CategoriesMapping.TASK_ID + "=" + Tables.INSTANCES + "."+TaskContract.Instances.TASK_ID+ ");";
-	
-	
-	/**
-	 * SQL command to drop the instance view.
-	 */
-	private final static String SQL_DROP_INSTANCE_VIEW = "DROP VIEW " + Tables.INSTANCE_VIEW + ";";
-	
-	
-	/**
-	 * SQL command to drop the instance property view.
-	 */
-	//private final static String SQL_DROP_INSTANCE_PROPERTY_VIEW = "DROP VIEW " + Tables.INSTANCE_PROPERTY_VIEW + ";";
-
-	/**
-	 * SQL command to create the instances table.
-	 */
-	private final static String SQL_CREATE_SYNCSTATE_TABLE =
-		"CREATE TABLE " + Tables.SYNCSTATE + " ( " +
-			TaskContract.SyncState._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
-		  + TaskContract.SyncState.ACCOUNT_NAME + " TEXT, "
-		  + TaskContract.SyncState.ACCOUNT_TYPE + " TEXT, "
-		  + TaskContract.SyncState.DATA + " TEXT "
-		  + ");";
-
-
-	/**
-	 * SQL command to create the instances table.
-	 */
-	private final static String SQL_CREATE_INSTANCES_TABLE =
-		"CREATE TABLE " + Tables.INSTANCES + " ( " +
-			TaskContract.Instances._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
-		  + TaskContract.Instances.TASK_ID + " INTEGER NOT NULL, " // NOT NULL
-		  + TaskContract.Instances.INSTANCE_START + " INTEGER, "
-		  + TaskContract.Instances.INSTANCE_DUE + " INTEGER, "
-		  + TaskContract.Instances.INSTANCE_START_SORTING + " INTEGER, "
-		  + TaskContract.Instances.INSTANCE_DUE_SORTING + " INTEGER, "
-		  + TaskContract.Instances.INSTANCE_DURATION + " INTEGER);";
-
-	
-	/**
-	 * SQL command to create a trigger to clean up data of removed tasks.
-	 */
-	private final static String SQL_CREATE_TASKS_CLEANUP_TRIGGER =
-		"CREATE TRIGGER task_cleanup_trigger AFTER DELETE ON " + Tables.TASKS
-		+ " BEGIN "
-		+ " DELETE FROM " + Tables.PROPERTIES + " WHERE " + TaskContract.Properties.TASK_ID + "= old." + TaskContract.Tasks._ID + ";"
-		+ " DELETE FROM " + Tables.INSTANCES + " WHERE " + TaskContract.Instances.TASK_ID + "=old." + TaskContract.Tasks._ID + ";"
-		+ " END;";
-	
-	/**
-	 * SQL command to create a trigger to clean up data of removed lists.
-	 */
-	private final static String SQL_CREATE_LISTS_CLEANUP_TRIGGER =
-		"CREATE TRIGGER list_cleanup_trigger AFTER DELETE ON " + Tables.LISTS
-		+ " BEGIN "
-		+ " DELETE FROM " + Tables.TASKS + " WHERE " + Tasks.LIST_ID + "= old." + TaskLists._ID + ";"
-		+ " END;";
-	
-	/**
-	 * SQL command to drop the clean up trigger.
-	 */
-	private final static String SQL_DROP_TASKS_CLEANUP_TRIGGER =
-		"DROP TRIGGER task_cleanup_trigger;";
-	
-	
-	/**
-	 * SQL command that counts and sets the alarm on deletion
-	 */
-	private final static String SQL_COUNT_ALARMS_ON_DELETE = 
-		" BEGIN UPDATE "+ Tables.TASKS  + " SET " + Tasks.HAS_ALARMS 
-		+ " = (SELECT COUNT (*) FROM " + Tables.PROPERTIES 
-		+ " WHERE " + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "' AND " + Alarm.ALARM_TYPE + " <> " + Alarm.ALARM_TYPE_NOTHING + " AND " + Properties.TASK_ID + " = OLD."  + Properties.TASK_ID 
-		+ ") WHERE " + Tasks._ID + " = OLD." + Properties.TASK_ID 
-		+ "; END;";  
-	
-	/**
-	 * SQL command that counts and sets the alarm on insert and update
-	 */
-	private final static String SQL_COUNT_ALARMS = 
-		" BEGIN UPDATE "+ Tables.TASKS  + " SET " + Tasks.HAS_ALARMS 
-		+ " = (SELECT COUNT (*) FROM " + Tables.PROPERTIES 
-		+ " WHERE " + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "' AND " + Alarm.ALARM_TYPE + " <> " + Alarm.ALARM_TYPE_NOTHING + " AND " + Properties.TASK_ID + " = NEW."  + Properties.TASK_ID 
-		+ ") WHERE " + Tasks._ID + " = NEW." + Properties.TASK_ID 
-		+ "; END;";  
-	
-	/**
-	 * SQL command to create a trigger that counts the alarms for a task on create
-	 */
-	private final static String SQL_CREATE_ALARM_COUNT_CREATE_TRIGGER = 
-		"CREATE TRIGGER alarm_count_create_trigger AFTER INSERT ON " + Tables.PROPERTIES  + " WHEN NEW." + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "'" 
-		+ SQL_COUNT_ALARMS;
-	
-	/**
-	 * SQL command to create a trigger that counts the alarms for a task on update
-	 */
-	private final static String SQL_CREATE_ALARM_COUNT_UPDATE_TRIGGER = 
-		"CREATE TRIGGER alarm_count_update_trigger AFTER UPDATE ON " + Tables.PROPERTIES  + " WHEN NEW." + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "'"  
-			+ SQL_COUNT_ALARMS;
-	
-	/**
-	 * SQL command to create a trigger that counts the alarms for a task on delete
-	 */
-	private final static String SQL_CREATE_ALARM_COUNT_DELETE_TRIGGER =
-		"CREATE TRIGGER alarm_count_delete_trigger AFTER DELETE ON " + Tables.PROPERTIES  + " WHEN OLD." + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "'" 
-			+ SQL_COUNT_ALARMS_ON_DELETE;
-	
-		
-	
-	/**
-	 * SQL command to create a trigger to clean up data of removed property.
-	 */
-	private final static String SQL_CREATE_ALARM_PROPERTY_CLEANUP_TRIGGER =
-		"CREATE TRIGGER alarm_property_cleanup_trigger AFTER DELETE ON " + Tables.PROPERTIES + " WHEN OLD." + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "'"  
-		+ " BEGIN "
-		+ " DELETE FROM " + Tables.ALARMS + " WHERE " + TaskContract.Alarms.ALARM_ID + "= OLD." + TaskContract.Properties.PROPERTY_ID + ";"
-		+ " END;";
-
-
-	/**
-	 * SQL command to create a trigger to clean up data of removed property.
-	 */
-	private final static String SQL_CREATE_CATEGORY_PROPERTY_CLEANUP_TRIGGER =
-		"CREATE TRIGGER category_property_cleanup_trigger AFTER DELETE ON " + Tables.PROPERTIES + " WHEN OLD." + Properties.MIMETYPE + " = '" + Category.CONTENT_ITEM_TYPE + "'"  
-		+ " BEGIN "
-		+ " DELETE FROM " + Tables.CATEGORIES_MAPPING + " WHERE " + CategoriesMapping.PROPERTY_ID + "= OLD." + TaskContract.Properties.PROPERTY_ID + ";"
-		+ " END;";
-
-
-	
-	/**
-	 * SQL command to create a trigger to clean up property data of removed task.
-	 */
-	private final static String SQL_CREATE_TASK_PROPERTY_CLEANUP_TRIGGER =
-		"CREATE TRIGGER task_property_cleanup_trigger AFTER DELETE ON " + Tables.TASKS + " BEGIN "
-		+ " DELETE FROM " + Tables.PROPERTIES + " WHERE " + Properties.TASK_ID + "= OLD." + Tasks._ID + ";"
-		+ " END;";
-
-	
-	
-	/**
-	 * SQL command to create the task list table.
-	 */
-	private final static String SQL_CREATE_LISTS_TABLE =
-		"CREATE TABLE " + Tables.LISTS + " ( "
-			+ TaskContract.TaskLists._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
-			+ TaskContract.TaskLists.ACCOUNT_NAME + " TEXT,"
-			+ TaskContract.TaskLists.ACCOUNT_TYPE + " TEXT,"
-			+ TaskContract.TaskLists.LIST_NAME + " TEXT,"
-			+ TaskContract.TaskLists.LIST_COLOR + " INTEGER,"
-			+ TaskContract.TaskLists.ACCESS_LEVEL + " INTEGER,"
-			+ TaskContract.TaskLists.VISIBLE + " INTEGER,"
-			+ TaskContract.TaskLists.SYNC_ENABLED + " INTEGER,"
-			+ TaskContract.TaskLists.OWNER + " TEXT,"
-			+ TaskContract.TaskLists._DIRTY + " INTEGER DEFAULT 0,"
-			+ TaskContract.TaskLists._SYNC_ID + " TEXT,"
-			+ TaskContract.TaskLists.SYNC_VERSION + " TEXT,"
-			+ TaskContract.TaskLists.SYNC1 + " TEXT,"
-			+ TaskContract.TaskLists.SYNC2 + " TEXT,"
-			+ TaskContract.TaskLists.SYNC3 + " TEXT,"
-			+ TaskContract.TaskLists.SYNC4 + " TEXT,"
-			+ TaskContract.TaskLists.SYNC5 + " TEXT,"
-			+ TaskContract.TaskLists.SYNC6 + " TEXT,"
-			+ TaskContract.TaskLists.SYNC7 + " TEXT,"
-			+ TaskContract.TaskLists.SYNC8 + " TEXT);";
-
-	
-	/**
-	 * SQL command to create the task table.
-	 */
-	private final static String SQL_CREATE_TASKS_TABLE =
-		"CREATE TABLE " + Tables.TASKS + " ( "
-			+ TaskContract.Tasks._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
-			+ TaskContract.Tasks.LIST_ID + " INTEGER NOT NULL, "
-			+ TaskContract.Tasks.TITLE + " TEXT,"
-			+ TaskContract.Tasks.LOCATION + " TEXT,"
-			+ TaskContract.Tasks.GEO + " TEXT,"
-			+ TaskContract.Tasks.DESCRIPTION + " TEXT,"
-			+ TaskContract.Tasks.URL + " TEXT,"
-			+ TaskContract.Tasks.ORGANIZER + " TEXT,"
-			+ TaskContract.Tasks.PRIORITY + " INTEGER, "
-			+ TaskContract.Tasks.TASK_COLOR + " INTEGER,"
-			+ TaskContract.Tasks.CLASSIFICATION + " INTEGER,"
-			+ TaskContract.Tasks.COMPLETED + " INTEGER,"
-			+ TaskContract.Tasks.COMPLETED_IS_ALLDAY + " INTEGER,"
-			+ TaskContract.Tasks.PERCENT_COMPLETE + " INTEGER,"
-			+ TaskContract.Tasks.STATUS + " INTEGER DEFAULT " + TaskContract.Tasks.STATUS_DEFAULT  + ","
-			+ TaskContract.Tasks.IS_NEW + " INTEGER,"
-			+ TaskContract.Tasks.IS_CLOSED + " INTEGER,"
-			+ TaskContract.Tasks.DTSTART + " INTEGER,"
-			+ TaskContract.Tasks.CREATED + " INTEGER,"
-			+ TaskContract.Tasks.LAST_MODIFIED + " INTEGER,"
-			+ TaskContract.Tasks.IS_ALLDAY + " INTEGER,"
-			+ TaskContract.Tasks.TZ + " TEXT,"
-			+ TaskContract.Tasks.DUE + " INTEGER,"
-			+ TaskContract.Tasks.DURATION + " TEXT,"
-			+ TaskContract.Tasks.RDATE + " TEXT,"
-			+ TaskContract.Tasks.EXDATE + " TEXT,"
-			+ TaskContract.Tasks.RRULE + " TEXT,"
-			+ TaskContract.Tasks.PARENT_ID + " INTEGER,"
-			+ TaskContract.Tasks.SORTING + " TEXT,"
-			+ TaskContract.Tasks.HAS_ALARMS + " INTEGER,"
-			+ TaskContract.Tasks.HAS_PROPERTIES + " INTEGER,"
-			+ TaskContract.Tasks.PINNED + " INTEGER,"
-			+ TaskContract.Tasks.ORIGINAL_INSTANCE_SYNC_ID + " TEXT,"
-			+ TaskContract.Tasks.ORIGINAL_INSTANCE_ID + " INTEGER,"
-			+ TaskContract.Tasks.ORIGINAL_INSTANCE_TIME + " INTEGER,"
-			+ TaskContract.Tasks.ORIGINAL_INSTANCE_ALLDAY + " INTEGER,"
-			+ TaskContract.Tasks._DIRTY + " INTEGER DEFAULT 1," // a new task is always dirty
-			+ TaskContract.Tasks._DELETED + " INTEGER DEFAULT 0," // new tasks are not deleted by default
-			+ TaskContract.Tasks._SYNC_ID + " TEXT,"
-			+ TaskContract.Tasks._UID + " TEXT,"
-			+ TaskContract.Tasks.SYNC_VERSION + " TEXT,"
-			+ TaskContract.Tasks.SYNC1 + " TEXT,"
-			+ TaskContract.Tasks.SYNC2 + " TEXT,"
-			+ TaskContract.Tasks.SYNC3 + " TEXT,"
-			+ TaskContract.Tasks.SYNC4 + " TEXT,"
-			+ TaskContract.Tasks.SYNC5 + " TEXT,"
-			+ TaskContract.Tasks.SYNC6 + " TEXT,"
-			+ TaskContract.Tasks.SYNC7 + " TEXT,"
-			+ TaskContract.Tasks.SYNC8 + " TEXT);";
-
-
-	/**
-	 * SQL command to create the categories table.
-	 */
-	private final static String SQL_CREATE_CATEGORIES_TABLE =
-		"CREATE TABLE " + Tables.CATEGORIES
-		+ " ( " + TaskContract.Categories._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
-		+ TaskContract.Categories.ACCOUNT_NAME + " TEXT,"
-		+ TaskContract.Categories.ACCOUNT_TYPE + " TEXT,"
-		+ TaskContract.Categories.NAME + " TEXT,"
-		+ TaskContract.Categories.COLOR + " INTEGER);";
-	
-	/**
-	 * SQL command to create the categories table.
-	 */
-	private final static String SQL_CREATE_CATEGORIES_MAPPING_TABLE =
-		"CREATE TABLE " + Tables.CATEGORIES_MAPPING
-		+ " ( " + CategoriesMapping.TASK_ID + " INTEGER,"
-		+ CategoriesMapping.CATEGORY_ID + " INTEGER,"
-		+ CategoriesMapping.PROPERTY_ID + " INTEGER,"
-		+ "FOREIGN KEY (" + CategoriesMapping.TASK_ID +") REFERENCES "+ Tables.TASKS + "(" + TaskContract.Tasks._ID + "),"
-		+ "FOREIGN KEY (" + CategoriesMapping.PROPERTY_ID +") REFERENCES "+ Tables.PROPERTIES + "(" + TaskContract.Properties.PROPERTY_ID + "),"
-		+ "FOREIGN KEY (" + CategoriesMapping.CATEGORY_ID + ") REFERENCES " + Tables.CATEGORIES + "(" + TaskContract.Categories._ID + "));";
-	
-	
-	/**
-	 * SQL command to create the alarms table the stores the already triggered alarms.
-	 */
-	private final static String SQL_CREATE_ALARMS_TABLE =
-		"CREATE TABLE " + Tables.ALARMS
-		+ " ( " + TaskContract.Alarms.ALARM_ID + " INTEGER,"
-		+ TaskContract.Alarms.LAST_TRIGGER + " TEXT,"
-		+ TaskContract.Alarms.NEXT_TRIGGER + " TEXT);";
-
-
-	/**
-	 * SQL command to create the table for extended properties.
-	 */
-	private final static String SQL_CREATE_PROPERTIES_TABLE =
-		"CREATE TABLE " + Tables.PROPERTIES + " ( "
-			+ TaskContract.Properties.PROPERTY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
-			+ TaskContract.Properties.TASK_ID + " INTEGER,"
-			+ TaskContract.Properties.MIMETYPE + " INTEGER,"
-			+ TaskContract.Properties.VERSION + " INTEGER,"
-			+ TaskContract.Properties.DATA0 + " TEXT,"
-			+ TaskContract.Properties.DATA1 + " TEXT,"
-			+ TaskContract.Properties.DATA2 + " TEXT,"
-			+ TaskContract.Properties.DATA3 + " TEXT,"
-			+ TaskContract.Properties.DATA4 + " TEXT,"
-			+ TaskContract.Properties.DATA5 + " TEXT,"
-			+ TaskContract.Properties.DATA6 + " TEXT,"
-			+ TaskContract.Properties.DATA7 + " TEXT,"
-			+ TaskContract.Properties.DATA8 + " TEXT,"
-			+ TaskContract.Properties.DATA9 + " TEXT,"
-			+ TaskContract.Properties.DATA10 + " TEXT,"
-			+ TaskContract.Properties.DATA11 + " TEXT,"
-			+ TaskContract.Properties.DATA12 + " TEXT,"
-			+ TaskContract.Properties.DATA13 + " TEXT,"
-			+ TaskContract.Properties.DATA14 + " TEXT,"
-			+ TaskContract.Properties.DATA15 + " TEXT,"
-			+ TaskContract.Properties.SYNC1 + " TEXT,"
-			+ TaskContract.Properties.SYNC2 + " TEXT,"
-			+ TaskContract.Properties.SYNC3 + " TEXT,"
-			+ TaskContract.Properties.SYNC4 + " TEXT,"
-			+ TaskContract.Properties.SYNC5 + " TEXT,"
-			+ TaskContract.Properties.SYNC6 + " TEXT,"
-			+ TaskContract.Properties.SYNC7 + " TEXT,"
-			+ TaskContract.Properties.SYNC8 + " TEXT);";
-	
-	
-	/**
-	 * SQL command to drop the task view.
-	 */
-	private final static String SQL_DROP_PROPERTIES_TABLE = "DROP TABLE " + Tables.PROPERTIES + ";";
-	
-	
+
+    /**
+     * SQL command to create a view that combines tasks with some data from the list they belong to.
+     */
+    private final static String SQL_CREATE_TASK_VIEW = "create view " + Tables.TASKS_VIEW + " as select " +
+        Tables.TASKS + ".*, " +
+        Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", " +
+        Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", " +
+        Tables.LISTS + "." + Tasks.LIST_OWNER + ", " +
+        Tables.LISTS + "." + Tasks.LIST_NAME + ", " +
+        Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", " +
+        Tables.LISTS + "." + Tasks.LIST_COLOR + ", " +
+        Tables.LISTS + "." + Tasks.VISIBLE +
+        " from " + Tables.TASKS + " join " + Tables.LISTS +
+        " on (" + Tables.TASKS + "." + Tasks.LIST_ID + "=" + Tables.LISTS + "." + TaskLists._ID + ");";
+
+    /**
+     * SQL command to create a view that combines tasks with some data from the list they belong to.
+     */
+    private final static String SQL_CREATE_TASK_PROPERTY_VIEW = "create view " + Tables.TASKS_PROPERTY_VIEW + " as select " +
+        Tables.TASKS + ".*, " +
+        Tables.PROPERTIES + ".*, "+
+        Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", " +
+        Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", " +
+        Tables.LISTS + "." + Tasks.LIST_OWNER + ", " +
+        Tables.LISTS + "." + Tasks.LIST_NAME + ", " +
+        Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", " +
+        Tables.LISTS + "." + Tasks.LIST_COLOR + ", " +
+        Tables.LISTS + "." + Tasks.VISIBLE +
+        " from " + Tables.TASKS + " join " + Tables.LISTS +
+        " on (" + Tables.TASKS + "." + Tasks.LIST_ID + "=" + Tables.LISTS + "." + TaskLists._ID + ") "+
+        "left join "+ Tables.PROPERTIES + " on (" + Tables.TASKS + "." + Tasks._ID + "=" + Tables.PROPERTIES + "." + Properties.TASK_ID +");";
+
+
+    /**
+     * SQL command to drop the task view.
+     */
+    private final static String SQL_DROP_TASK_VIEW = "DROP VIEW " + Tables.TASKS_VIEW + ";";
+
+
+    /**
+     * SQL command to create a view that combines task instances with some data from the list they belong to.
+     */
+    private final static String SQL_CREATE_INSTANCE_VIEW = "CREATE VIEW " + Tables.INSTANCE_VIEW + " AS SELECT "
+        + Tables.INSTANCES + ".*, "
+        + Tables.TASKS + ".*, "
+        + Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", "
+        + Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", "
+        + Tables.LISTS + "." + Tasks.LIST_OWNER + ", "
+        + Tables.LISTS + "." + Tasks.LIST_NAME + ", "
+        + Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", "
+        + Tables.LISTS + "." + Tasks.LIST_COLOR + ", "
+        + Tables.LISTS + "." + Tasks.VISIBLE
+        + " FROM " + Tables.TASKS
+        + " JOIN " + Tables.LISTS + " ON (" + Tables.TASKS + "."+ TaskContract.Tasks.LIST_ID + "=" + Tables.LISTS + "."+TaskContract.Tasks._ID + ")"
+        + " JOIN " + Tables.INSTANCES + " ON (" + Tables.TASKS + "." + TaskContract.Tasks._ID + "=" + Tables.INSTANCES + "."+TaskContract.Instances.TASK_ID+ ");";
+
+
+    /**
+     * SQL command to create a view that combines task instances view with the belonging properties.
+     */
+    private final static String SQL_CREATE_INSTANCE_PROPERTY_VIEW = "CREATE VIEW " + Tables.INSTANCE_PROPERTY_VIEW + " AS SELECT "
+        + Tables.INSTANCES + ".*, "
+        + Tables.PROPERTIES + ".*, "
+        + Tables.TASKS + ".*, "
+        + Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", "
+        + Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", "
+        + Tables.LISTS + "." + Tasks.LIST_OWNER + ", "
+        + Tables.LISTS + "." + Tasks.LIST_NAME + ", "
+        + Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", "
+        + Tables.LISTS + "." + Tasks.LIST_COLOR + ", "
+        + Tables.LISTS + "." + Tasks.VISIBLE
+        + " FROM " + Tables.TASKS
+        + " JOIN " + Tables.LISTS + " ON (" + Tables.TASKS + "."+ TaskContract.Tasks.LIST_ID + "=" + Tables.LISTS + "."+TaskContract.Tasks._ID + ")"
+        + " JOIN " + Tables.INSTANCES + " ON (" + Tables.TASKS + "." + TaskContract.Tasks._ID + "=" + Tables.INSTANCES + "."+TaskContract.Instances.TASK_ID+ ")"
+        + " LEFT JOIN "+ Tables.PROPERTIES + " ON (" + Tables.TASKS + "." + Tasks._ID + "=" + Tables.PROPERTIES + "." + Properties.TASK_ID +");";
+
+
+    /**
+     * SQL command to create a view that combines task instances with some data from the list they belong to.
+     */
+    private final static String SQL_CREATE_INSTANCE_CATEGORY_VIEW = "CREATE VIEW " + Tables.INSTANCE_CATEGORY_VIEW + " AS SELECT "
+        + Tables.INSTANCES + ".*, "
+        + Tables.CATEGORIES_MAPPING + "." + CategoriesMapping.CATEGORY_ID + ", "
+        + Tables.TASKS + ".*, "
+        + Tables.LISTS + "." + Tasks.ACCOUNT_NAME + ", "
+        + Tables.LISTS + "." + Tasks.ACCOUNT_TYPE + ", "
+        + Tables.LISTS + "." + Tasks.LIST_OWNER + ", "
+        + Tables.LISTS + "." + Tasks.LIST_NAME + ", "
+        + Tables.LISTS + "." + Tasks.LIST_ACCESS_LEVEL + ", "
+        + Tables.LISTS + "." + Tasks.LIST_COLOR + ", "
+        + Tables.LISTS + "." + Tasks.VISIBLE
+        + " FROM " + Tables.TASKS
+        + " JOIN " + Tables.LISTS + " ON (" + Tables.TASKS + "."+ TaskContract.Tasks.LIST_ID + "=" + Tables.LISTS + "."+TaskContract.Tasks._ID + ")"
+        + " JOIN " + Tables.INSTANCES + " ON (" + Tables.TASKS + "." + TaskContract.Tasks._ID + "=" + Tables.INSTANCES + "."+TaskContract.Instances.TASK_ID+ ")"
+        + " LEFT JOIN " + Tables.CATEGORIES_MAPPING + " ON (" + Tables.CATEGORIES_MAPPING + "." + CategoriesMapping.TASK_ID + "=" + Tables.INSTANCES + "."+TaskContract.Instances.TASK_ID+ ");";
+
+
+    /**
+     * SQL command to drop the instance view.
+     */
+    private final static String SQL_DROP_INSTANCE_VIEW = "DROP VIEW " + Tables.INSTANCE_VIEW + ";";
+
+
+    /**
+     * SQL command to drop the instance property view.
+     */
+    //private final static String SQL_DROP_INSTANCE_PROPERTY_VIEW = "DROP VIEW " + Tables.INSTANCE_PROPERTY_VIEW + ";";
+
+    /**
+     * SQL command to create the instances table.
+     */
+    private final static String SQL_CREATE_SYNCSTATE_TABLE =
+        "CREATE TABLE " + Tables.SYNCSTATE + " ( " +
+            TaskContract.SyncState._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+          + TaskContract.SyncState.ACCOUNT_NAME + " TEXT, "
+          + TaskContract.SyncState.ACCOUNT_TYPE + " TEXT, "
+          + TaskContract.SyncState.DATA + " TEXT "
+          + ");";
+
+
+    /**
+     * SQL command to create the instances table.
+     */
+    private final static String SQL_CREATE_INSTANCES_TABLE =
+        "CREATE TABLE " + Tables.INSTANCES + " ( " +
+            TaskContract.Instances._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+          + TaskContract.Instances.TASK_ID + " INTEGER NOT NULL, " // NOT NULL
+          + TaskContract.Instances.INSTANCE_START + " INTEGER, "
+          + TaskContract.Instances.INSTANCE_DUE + " INTEGER, "
+          + TaskContract.Instances.INSTANCE_START_SORTING + " INTEGER, "
+          + TaskContract.Instances.INSTANCE_DUE_SORTING + " INTEGER, "
+          + TaskContract.Instances.INSTANCE_DURATION + " INTEGER);";
+
+
+    /**
+     * SQL command to create a trigger to clean up data of removed tasks.
+     */
+    private final static String SQL_CREATE_TASKS_CLEANUP_TRIGGER =
+        "CREATE TRIGGER task_cleanup_trigger AFTER DELETE ON " + Tables.TASKS
+        + " BEGIN "
+        + " DELETE FROM " + Tables.PROPERTIES + " WHERE " + TaskContract.Properties.TASK_ID + "= old." + TaskContract.Tasks._ID + ";"
+        + " DELETE FROM " + Tables.INSTANCES + " WHERE " + TaskContract.Instances.TASK_ID + "=old." + TaskContract.Tasks._ID + ";"
+        + " END;";
+
+    /**
+     * SQL command to create a trigger to clean up data of removed lists.
+     */
+    private final static String SQL_CREATE_LISTS_CLEANUP_TRIGGER =
+        "CREATE TRIGGER list_cleanup_trigger AFTER DELETE ON " + Tables.LISTS
+        + " BEGIN "
+        + " DELETE FROM " + Tables.TASKS + " WHERE " + Tasks.LIST_ID + "= old." + TaskLists._ID + ";"
+        + " END;";
+
+    /**
+     * SQL command to drop the clean up trigger.
+     */
+    private final static String SQL_DROP_TASKS_CLEANUP_TRIGGER =
+        "DROP TRIGGER task_cleanup_trigger;";
+
+
+    /**
+     * SQL command that counts and sets the alarm on deletion
+     */
+    private final static String SQL_COUNT_ALARMS_ON_DELETE =
+        " BEGIN UPDATE "+ Tables.TASKS  + " SET " + Tasks.HAS_ALARMS
+        + " = (SELECT COUNT (*) FROM " + Tables.PROPERTIES
+        + " WHERE " + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "' AND " + Alarm.ALARM_TYPE + " <> " + Alarm.ALARM_TYPE_NOTHING + " AND " + Properties.TASK_ID + " = OLD."  + Properties.TASK_ID
+        + ") WHERE " + Tasks._ID + " = OLD." + Properties.TASK_ID
+        + "; END;";
+
+    /**
+     * SQL command that counts and sets the alarm on insert and update
+     */
+    private final static String SQL_COUNT_ALARMS =
+        " BEGIN UPDATE "+ Tables.TASKS  + " SET " + Tasks.HAS_ALARMS
+        + " = (SELECT COUNT (*) FROM " + Tables.PROPERTIES
+        + " WHERE " + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "' AND " + Alarm.ALARM_TYPE + " <> " + Alarm.ALARM_TYPE_NOTHING + " AND " + Properties.TASK_ID + " = NEW."  + Properties.TASK_ID
+        + ") WHERE " + Tasks._ID + " = NEW." + Properties.TASK_ID
+        + "; END;";
+
+    /**
+     * SQL command to create a trigger that counts the alarms for a task on create
+     */
+    private final static String SQL_CREATE_ALARM_COUNT_CREATE_TRIGGER =
+        "CREATE TRIGGER alarm_count_create_trigger AFTER INSERT ON " + Tables.PROPERTIES  + " WHEN NEW." + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "'"
+        + SQL_COUNT_ALARMS;
+
+    /**
+     * SQL command to create a trigger that counts the alarms for a task on update
+     */
+    private final static String SQL_CREATE_ALARM_COUNT_UPDATE_TRIGGER =
+        "CREATE TRIGGER alarm_count_update_trigger AFTER UPDATE ON " + Tables.PROPERTIES  + " WHEN NEW." + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "'"
+            + SQL_COUNT_ALARMS;
+
+    /**
+     * SQL command to create a trigger that counts the alarms for a task on delete
+     */
+    private final static String SQL_CREATE_ALARM_COUNT_DELETE_TRIGGER =
+        "CREATE TRIGGER alarm_count_delete_trigger AFTER DELETE ON " + Tables.PROPERTIES  + " WHEN OLD." + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "'"
+            + SQL_COUNT_ALARMS_ON_DELETE;
+
+
+
+    /**
+     * SQL command to create a trigger to clean up data of removed property.
+     */
+    private final static String SQL_CREATE_ALARM_PROPERTY_CLEANUP_TRIGGER =
+        "CREATE TRIGGER alarm_property_cleanup_trigger AFTER DELETE ON " + Tables.PROPERTIES + " WHEN OLD." + Properties.MIMETYPE + " = '" + Alarm.CONTENT_ITEM_TYPE + "'"
+        + " BEGIN "
+        + " DELETE FROM " + Tables.ALARMS + " WHERE " + TaskContract.Alarms.ALARM_ID + "= OLD." + TaskContract.Properties.PROPERTY_ID + ";"
+        + " END;";
+
+
+    /**
+     * SQL command to create a trigger to clean up data of removed property.
+     */
+    private final static String SQL_CREATE_CATEGORY_PROPERTY_CLEANUP_TRIGGER =
+        "CREATE TRIGGER category_property_cleanup_trigger AFTER DELETE ON " + Tables.PROPERTIES + " WHEN OLD." + Properties.MIMETYPE + " = '" + Category.CONTENT_ITEM_TYPE + "'"
+        + " BEGIN "
+        + " DELETE FROM " + Tables.CATEGORIES_MAPPING + " WHERE " + CategoriesMapping.PROPERTY_ID + "= OLD." + TaskContract.Properties.PROPERTY_ID + ";"
+        + " END;";
+
+
+
+    /**
+     * SQL command to create a trigger to clean up property data of removed task.
+     */
+    private final static String SQL_CREATE_TASK_PROPERTY_CLEANUP_TRIGGER =
+        "CREATE TRIGGER task_property_cleanup_trigger AFTER DELETE ON " + Tables.TASKS + " BEGIN "
+        + " DELETE FROM " + Tables.PROPERTIES + " WHERE " + Properties.TASK_ID + "= OLD." + Tasks._ID + ";"
+        + " END;";
+
+
+
+    /**
+     * SQL command to create the task list table.
+     */
+    private final static String SQL_CREATE_LISTS_TABLE =
+        "CREATE TABLE " + Tables.LISTS + " ( "
+            + TaskContract.TaskLists._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+            + TaskContract.TaskLists.ACCOUNT_NAME + " TEXT,"
+            + TaskContract.TaskLists.ACCOUNT_TYPE + " TEXT,"
+            + TaskContract.TaskLists.LIST_NAME + " TEXT,"
+            + TaskContract.TaskLists.LIST_COLOR + " INTEGER,"
+            + TaskContract.TaskLists.ACCESS_LEVEL + " INTEGER,"
+            + TaskContract.TaskLists.VISIBLE + " INTEGER,"
+            + TaskContract.TaskLists.SYNC_ENABLED + " INTEGER,"
+            + TaskContract.TaskLists.OWNER + " TEXT,"
+            + TaskContract.TaskLists._DIRTY + " INTEGER DEFAULT 0,"
+            + TaskContract.TaskLists._SYNC_ID + " TEXT,"
+            + TaskContract.TaskLists.SYNC_VERSION + " TEXT,"
+            + TaskContract.TaskLists.SYNC1 + " TEXT,"
+            + TaskContract.TaskLists.SYNC2 + " TEXT,"
+            + TaskContract.TaskLists.SYNC3 + " TEXT,"
+            + TaskContract.TaskLists.SYNC4 + " TEXT,"
+            + TaskContract.TaskLists.SYNC5 + " TEXT,"
+            + TaskContract.TaskLists.SYNC6 + " TEXT,"
+            + TaskContract.TaskLists.SYNC7 + " TEXT,"
+            + TaskContract.TaskLists.SYNC8 + " TEXT);";
+
+
+    /**
+     * SQL command to create the task table.
+     */
+    private final static String SQL_CREATE_TASKS_TABLE =
+        "CREATE TABLE " + Tables.TASKS + " ( "
+            + TaskContract.Tasks._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+            + TaskContract.Tasks.LIST_ID + " INTEGER NOT NULL, "
+            + TaskContract.Tasks.TITLE + " TEXT,"
+            + TaskContract.Tasks.LOCATION + " TEXT,"
+            + TaskContract.Tasks.GEO + " TEXT,"
+            + TaskContract.Tasks.DESCRIPTION + " TEXT,"
+            + TaskContract.Tasks.URL + " TEXT,"
+            + TaskContract.Tasks.ORGANIZER + " TEXT,"
+            + TaskContract.Tasks.PRIORITY + " INTEGER, "
+            + TaskContract.Tasks.TASK_COLOR + " INTEGER,"
+            + TaskContract.Tasks.CLASSIFICATION + " INTEGER,"
+            + TaskContract.Tasks.COMPLETED + " INTEGER,"
+            + TaskContract.Tasks.COMPLETED_IS_ALLDAY + " INTEGER,"
+            + TaskContract.Tasks.PERCENT_COMPLETE + " INTEGER,"
+            + TaskContract.Tasks.STATUS + " INTEGER DEFAULT " + TaskContract.Tasks.STATUS_DEFAULT  + ","
+            + TaskContract.Tasks.IS_NEW + " INTEGER,"
+            + TaskContract.Tasks.IS_CLOSED + " INTEGER,"
+            + TaskContract.Tasks.DTSTART + " INTEGER,"
+            + TaskContract.Tasks.CREATED + " INTEGER,"
+            + TaskContract.Tasks.LAST_MODIFIED + " INTEGER,"
+            + TaskContract.Tasks.IS_ALLDAY + " INTEGER,"
+            + TaskContract.Tasks.TZ + " TEXT,"
+            + TaskContract.Tasks.DUE + " INTEGER,"
+            + TaskContract.Tasks.DURATION + " TEXT,"
+            + TaskContract.Tasks.RDATE + " TEXT,"
+            + TaskContract.Tasks.EXDATE + " TEXT,"
+            + TaskContract.Tasks.RRULE + " TEXT,"
+            + TaskContract.Tasks.PARENT_ID + " INTEGER,"
+            + TaskContract.Tasks.SORTING + " TEXT,"
+            + TaskContract.Tasks.HAS_ALARMS + " INTEGER,"
+            + TaskContract.Tasks.HAS_PROPERTIES + " INTEGER,"
+            + TaskContract.Tasks.PINNED + " INTEGER,"
+            + TaskContract.Tasks.ORIGINAL_INSTANCE_SYNC_ID + " TEXT,"
+            + TaskContract.Tasks.ORIGINAL_INSTANCE_ID + " INTEGER,"
+            + TaskContract.Tasks.ORIGINAL_INSTANCE_TIME + " INTEGER,"
+            + TaskContract.Tasks.ORIGINAL_INSTANCE_ALLDAY + " INTEGER,"
+            + TaskContract.Tasks._DIRTY + " INTEGER DEFAULT 1," // a new task is always dirty
+            + TaskContract.Tasks._DELETED + " INTEGER DEFAULT 0," // new tasks are not deleted by default
+            + TaskContract.Tasks._SYNC_ID + " TEXT,"
+            + TaskContract.Tasks._UID + " TEXT,"
+            + TaskContract.Tasks.SYNC_VERSION + " TEXT,"
+            + TaskContract.Tasks.SYNC1 + " TEXT,"
+            + TaskContract.Tasks.SYNC2 + " TEXT,"
+            + TaskContract.Tasks.SYNC3 + " TEXT,"
+            + TaskContract.Tasks.SYNC4 + " TEXT,"
+            + TaskContract.Tasks.SYNC5 + " TEXT,"
+            + TaskContract.Tasks.SYNC6 + " TEXT,"
+            + TaskContract.Tasks.SYNC7 + " TEXT,"
+            + TaskContract.Tasks.SYNC8 + " TEXT);";
+
+
+    /**
+     * SQL command to create the categories table.
+     */
+    private final static String SQL_CREATE_CATEGORIES_TABLE =
+        "CREATE TABLE " + Tables.CATEGORIES
+        + " ( " + TaskContract.Categories._ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+        + TaskContract.Categories.ACCOUNT_NAME + " TEXT,"
+        + TaskContract.Categories.ACCOUNT_TYPE + " TEXT,"
+        + TaskContract.Categories.NAME + " TEXT,"
+        + TaskContract.Categories.COLOR + " INTEGER);";
+
+    /**
+     * SQL command to create the categories table.
+     */
+    private final static String SQL_CREATE_CATEGORIES_MAPPING_TABLE =
+        "CREATE TABLE " + Tables.CATEGORIES_MAPPING
+        + " ( " + CategoriesMapping.TASK_ID + " INTEGER,"
+        + CategoriesMapping.CATEGORY_ID + " INTEGER,"
+        + CategoriesMapping.PROPERTY_ID + " INTEGER,"
+        + "FOREIGN KEY (" + CategoriesMapping.TASK_ID +") REFERENCES "+ Tables.TASKS + "(" + TaskContract.Tasks._ID + "),"
+        + "FOREIGN KEY (" + CategoriesMapping.PROPERTY_ID +") REFERENCES "+ Tables.PROPERTIES + "(" + TaskContract.Properties.PROPERTY_ID + "),"
+        + "FOREIGN KEY (" + CategoriesMapping.CATEGORY_ID + ") REFERENCES " + Tables.CATEGORIES + "(" + TaskContract.Categories._ID + "));";
+
+
+    /**
+     * SQL command to create the alarms table the stores the already triggered alarms.
+     */
+    private final static String SQL_CREATE_ALARMS_TABLE =
+        "CREATE TABLE " + Tables.ALARMS
+        + " ( " + TaskContract.Alarms.ALARM_ID + " INTEGER,"
+        + TaskContract.Alarms.LAST_TRIGGER + " TEXT,"
+        + TaskContract.Alarms.NEXT_TRIGGER + " TEXT);";
+
+
+    /**
+     * SQL command to create the table for extended properties.
+     */
+    private final static String SQL_CREATE_PROPERTIES_TABLE =
+        "CREATE TABLE " + Tables.PROPERTIES + " ( "
+            + TaskContract.Properties.PROPERTY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+            + TaskContract.Properties.TASK_ID + " INTEGER,"
+            + TaskContract.Properties.MIMETYPE + " INTEGER,"
+            + TaskContract.Properties.VERSION + " INTEGER,"
+            + TaskContract.Properties.DATA0 + " TEXT,"
+            + TaskContract.Properties.DATA1 + " TEXT,"
+            + TaskContract.Properties.DATA2 + " TEXT,"
+            + TaskContract.Properties.DATA3 + " TEXT,"
+            + TaskContract.Properties.DATA4 + " TEXT,"
+            + TaskContract.Properties.DATA5 + " TEXT,"
+            + TaskContract.Properties.DATA6 + " TEXT,"
+            + TaskContract.Properties.DATA7 + " TEXT,"
+            + TaskContract.Properties.DATA8 + " TEXT,"
+            + TaskContract.Properties.DATA9 + " TEXT,"
+            + TaskContract.Properties.DATA10 + " TEXT,"
+            + TaskContract.Properties.DATA11 + " TEXT,"
+            + TaskContract.Properties.DATA12 + " TEXT,"
+            + TaskContract.Properties.DATA13 + " TEXT,"
+            + TaskContract.Properties.DATA14 + " TEXT,"
+            + TaskContract.Properties.DATA15 + " TEXT,"
+            + TaskContract.Properties.SYNC1 + " TEXT,"
+            + TaskContract.Properties.SYNC2 + " TEXT,"
+            + TaskContract.Properties.SYNC3 + " TEXT,"
+            + TaskContract.Properties.SYNC4 + " TEXT,"
+            + TaskContract.Properties.SYNC5 + " TEXT,"
+            + TaskContract.Properties.SYNC6 + " TEXT,"
+            + TaskContract.Properties.SYNC7 + " TEXT,"
+            + TaskContract.Properties.SYNC8 + " TEXT);";
+
+
+    /**
+     * SQL command to drop the task view.
+     */
+    private final static String SQL_DROP_PROPERTIES_TABLE = "DROP TABLE " + Tables.PROPERTIES + ";";
+
+
     // @formatter:on
 
 
diff --git a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskProvider.java b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskProvider.java
index 3333735d1..09fbee506 100644
--- a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskProvider.java
+++ b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/TaskProvider.java
@@ -723,7 +723,7 @@ public int deleteInTransaction(final SQLiteDatabase db, Uri uri, String selectio
             }
             /*
              * Deleting task lists is only allowed to sync adapters. They must provide ACCOUNT_NAME and ACCOUNT_TYPE.
-			 */
+             */
             case LIST_ID:
                 // add _id to selection and fall through
                 selection = updateSelection(selectId(uri), selection);
@@ -760,7 +760,7 @@ public int deleteInTransaction(final SQLiteDatabase db, Uri uri, String selectio
             }
             /*
              * Task won't be removed, just marked as deleted if the caller isn't a sync adapter. Sync adapters can remove tasks immediately.
-			 */
+             */
             case TASK_ID:
                 // add id to selection and fall through
                 selection = updateSelection(selectId(uri), selection);
diff --git a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/handler/RelationHandler.java b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/handler/RelationHandler.java
index fc3b50f12..2e6c6a75e 100644
--- a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/handler/RelationHandler.java
+++ b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/handler/RelationHandler.java
@@ -221,12 +221,12 @@ private void clearParentId(SQLiteDatabase db, long taskId, Cursor oldValues)
     {
         int type = oldValues.getInt(oldValues.getColumnIndex(Relation.RELATED_TYPE));
 
-		/*
+        /*
          * This is more complicated than it may sound. We don't know the order in which relations are created, updated or removed. So it's possible that a new
-		 * parent relationship has been created and the old one is removed afterwards. In that case we can not simply clear the PARENT_ID.
-		 * 
-		 * FIXME: For now we ignore that fact. But we should fix it.
-		 */
+         * parent relationship has been created and the old one is removed afterwards. In that case we can not simply clear the PARENT_ID.
+         *
+         * FIXME: For now we ignore that fact. But we should fix it.
+         */
 
         if (type == Relation.RELTYPE_PARENT)
         {
@@ -252,9 +252,9 @@ else if (type == Relation.RELTYPE_SIBLING)
         {
             /*
              * This was a link to a sibling, since it's no longer our sibling either it or we're orphaned now We won't know unless we check all relations.
-			 * 
-			 * FIXME: properly handle this case
-			 */
+             *
+             * FIXME: properly handle this case
+             */
         }
     }
 }
diff --git a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/AutoUpdateProcessor.java b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/AutoUpdateProcessor.java
index f8bca0b74..caf1179e8 100644
--- a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/AutoUpdateProcessor.java
+++ b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/AutoUpdateProcessor.java
@@ -198,10 +198,10 @@ else if (!isSyncAdapter && percent != null)
             task.set(TaskAdapter.IS_NEW, status == null || status == Tasks.STATUS_NEEDS_ACTION);
             task.set(TaskAdapter.IS_CLOSED, status != null && (status == Tasks.STATUS_COMPLETED || status == Tasks.STATUS_CANCELLED));
 
-			/*
+            /*
              * Update PERCENT_COMPLETE and COMPLETED (if not given). Sync adapters should know what they're doing, so don't update anything if caller is a sync
-			 * adapter.
-			 */
+             * adapter.
+             */
             if (status == Tasks.STATUS_COMPLETED && !isSyncAdapter)
             {
                 task.set(TaskAdapter.PERCENT_COMPLETE, 100);
diff --git a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/ChangeListProcessor.java b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/ChangeListProcessor.java
index fa91dc4ed..7c5d48e2d 100644
--- a/opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/ChangeListProcessor.java
+++ b/opentasks-provider/src/main/java/org/dmfs/provider/tasks/processors/tasks/ChangeListProcessor.java
@@ -124,12 +124,12 @@ private Long moveTask(SQLiteDatabase db, TaskAdapter task, long oldList, long ne
     {
         /*
          * The task has been moved to a different list. Sync adapters are not expected to support this (especially since the new list may belong to a completely
-		 * different account or even account-type), so we emulate a copy & delete operation.
-		 * 
-		 * All sync adapter fields of the task are cleared, so it looks like a new task. In addition we create a new deleted task in the old list having the old
-		 * sync adapter field values. This means that the _ID field of the "deleted" task will not equal the _ID field f the original task. Sync adapters should
-		 * handle that correctly.
-		 */
+         * different account or even account-type), so we emulate a copy & delete operation.
+         *
+         * All sync adapter fields of the task are cleared, so it looks like a new task. In addition we create a new deleted task in the old list having the old
+         * sync adapter field values. This means that the _ID field of the "deleted" task will not equal the _ID field f the original task. Sync adapters should
+         * handle that correctly.
+         */
 
         Long result = null;
 
diff --git a/opentasks/src/main/java/com/jmedeisis/draglinearlayout/DragLinearLayout.java b/opentasks/src/main/java/com/jmedeisis/draglinearlayout/DragLinearLayout.java
index 29b602780..bd2c2ccc9 100644
--- a/opentasks/src/main/java/com/jmedeisis/draglinearlayout/DragLinearLayout.java
+++ b/opentasks/src/main/java/com/jmedeisis/draglinearlayout/DragLinearLayout.java
@@ -251,12 +251,12 @@ public void stopDetecting()
     /**
      * The shadow to be drawn above the {@link #draggedItem}.
      */
-//	private final Drawable dragTopShadowDrawable;
+//    private final Drawable dragTopShadowDrawable;
     /**
      * The shadow to be drawn below the {@link #draggedItem}.
      */
-//	private final Drawable dragBottomShadowDrawable;
-//	private final int dragShadowHeight;
+//    private final Drawable dragBottomShadowDrawable;
+//    private final int dragShadowHeight;
 
     /**
      * See {@link #setContainerScrollView(android.widget.ScrollView)}.
@@ -287,24 +287,24 @@ public DragLinearLayout(Context context, AttributeSet attrs)
 
         final Resources resources = getResources();
         // changed by dmfs: don't use shadows
-//		dragTopShadowDrawable = ContextCompat.getDrawable(context, R.drawable.ab_solid_shadow_holo_flipped);
-//		dragBottomShadowDrawable = ContextCompat.getDrawable(context, R.drawable.ab_solid_shadow_holo);
-//		dragShadowHeight = resources.getDimensionPixelSize(R.dimen.downwards_drop_shadow_height);
+//        dragTopShadowDrawable = ContextCompat.getDrawable(context, R.drawable.ab_solid_shadow_holo_flipped);
+//        dragBottomShadowDrawable = ContextCompat.getDrawable(context, R.drawable.ab_solid_shadow_holo);
+//        dragShadowHeight = resources.getDimensionPixelSize(R.dimen.downwards_drop_shadow_height);
 
         // changed by dmfs: don't use DragLinearLayout_scrollSensitiveHeight from resources, use default
         scrollSensitiveAreaHeight =
                 (int) (DEFAULT_SCROLL_SENSITIVE_AREA_HEIGHT_DP * resources.getDisplayMetrics().density + 0.5f);
 
-//		TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DragLinearLayout, 0, 0);
-//		try
-//		{
-//			scrollSensitiveAreaHeight = a.getDimensionPixelSize(R.styleable.DragLinearLayout_scrollSensitiveHeight,
-//				(int) (DEFAULT_SCROLL_SENSITIVE_AREA_HEIGHT_DP * resources.getDisplayMetrics().density + 0.5f));
-//		}
-//		finally
-//		{
-//			a.recycle();
-//		}
+//        TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DragLinearLayout, 0, 0);
+//        try
+//        {
+//            scrollSensitiveAreaHeight = a.getDimensionPixelSize(R.styleable.DragLinearLayout_scrollSensitiveHeight,
+//                (int) (DEFAULT_SCROLL_SENSITIVE_AREA_HEIGHT_DP * resources.getDisplayMetrics().density + 0.5f));
+//        }
+//        finally
+//        {
+//            a.recycle();
+//        }
 
         nominalDistanceScaled = (int) (NOMINAL_DISTANCE * resources.getDisplayMetrics().density + 0.5f);
     }
@@ -527,9 +527,9 @@ public void onAnimationUpdate(ValueAnimator animation)
                 draggedItem.setTotalOffset(((Float) animation.getAnimatedValue()).intValue());
 
                 final int shadowAlpha = (int) ((1 - animation.getAnimatedFraction()) * 255);
-//				if (null != dragTopShadowDrawable)
-//					dragTopShadowDrawable.setAlpha(shadowAlpha);
-//				dragBottomShadowDrawable.setAlpha(shadowAlpha);
+//                if (null != dragTopShadowDrawable)
+//                    dragTopShadowDrawable.setAlpha(shadowAlpha);
+//                dragBottomShadowDrawable.setAlpha(shadowAlpha);
                 invalidate();
             }
         });
@@ -553,9 +553,9 @@ public void onAnimationEnd(Animator animation)
                 draggedItem.settleAnimation = null;
                 draggedItem.stopDetecting();
 
-//				if (null != dragTopShadowDrawable)
-//					dragTopShadowDrawable.setAlpha(255);
-//				dragBottomShadowDrawable.setAlpha(255);
+//                if (null != dragTopShadowDrawable)
+//                    dragTopShadowDrawable.setAlpha(255);
+//                dragBottomShadowDrawable.setAlpha(255);
 
                 // restore layout transition
                 if (layoutTransition != null && getLayoutTransition() == null)
@@ -773,33 +773,33 @@ protected void dispatchDraw(@NonNull Canvas canvas)
             final int top = draggedItem.viewDrawable.getBounds().top;
             final int bottom = draggedItem.viewDrawable.getBounds().bottom;
 
-//			dragBottomShadowDrawable.setBounds(left, bottom, right, bottom + dragShadowHeight);
-//			dragBottomShadowDrawable.draw(canvas);
+//            dragBottomShadowDrawable.setBounds(left, bottom, right, bottom + dragShadowHeight);
+//            dragBottomShadowDrawable.draw(canvas);
 //
-//			if (null != dragTopShadowDrawable)
-//			{
-//				dragTopShadowDrawable.setBounds(left, top - dragShadowHeight, right, top);
-//				dragTopShadowDrawable.draw(canvas);
-//			}
+//            if (null != dragTopShadowDrawable)
+//            {
+//                dragTopShadowDrawable.setBounds(left, top - dragShadowHeight, right, top);
+//                dragTopShadowDrawable.draw(canvas);
+//            }
 
             canvas.restore();
         }
     }
 
 
-	/*
+    /*
      * Note regarding touch handling: In general, we have three cases - 1) User taps outside any children. #onInterceptTouchEvent receives DOWN #onTouchEvent
-	 * receives DOWN draggedItem.detecting == false, we return false and no further events are received 2) User taps on non-interactive drag handle / child,
-	 * e.g. TextView or ImageView. #onInterceptTouchEvent receives DOWN DragHandleOnTouchListener (attached to each draggable child) #onTouch receives DOWN
-	 * #startDetectingDrag is called, draggedItem is now detecting view does not handle touch, so our #onTouchEvent receives DOWN draggedItem.detecting == true,
-	 * we #startDrag() and proceed to handle the drag 3) User taps on interactive drag handle / child, e.g. Button. #onInterceptTouchEvent receives DOWN
-	 * DragHandleOnTouchListener (attached to each draggable child) #onTouch receives DOWN #startDetectingDrag is called, draggedItem is now detecting view
-	 * handles touch, so our #onTouchEvent is not called yet #onInterceptTouchEvent receives ACTION_MOVE if dy > touch slop, we assume user wants to drag and
-	 * intercept the event #onTouchEvent receives further ACTION_MOVE events, proceed to handle the drag
-	 * 
-	 * For cases 2) and 3), lifting the active pointer at any point in the sequence of events triggers #onTouchEnd and the draggedItem, if detecting, is
-	 * #stopDetecting.
-	 */
+     * receives DOWN draggedItem.detecting == false, we return false and no further events are received 2) User taps on non-interactive drag handle / child,
+     * e.g. TextView or ImageView. #onInterceptTouchEvent receives DOWN DragHandleOnTouchListener (attached to each draggable child) #onTouch receives DOWN
+     * #startDetectingDrag is called, draggedItem is now detecting view does not handle touch, so our #onTouchEvent receives DOWN draggedItem.detecting == true,
+     * we #startDrag() and proceed to handle the drag 3) User taps on interactive drag handle / child, e.g. Button. #onInterceptTouchEvent receives DOWN
+     * DragHandleOnTouchListener (attached to each draggable child) #onTouch receives DOWN #startDetectingDrag is called, draggedItem is now detecting view
+     * handles touch, so our #onTouchEvent is not called yet #onInterceptTouchEvent receives ACTION_MOVE if dy > touch slop, we assume user wants to drag and
+     * intercept the event #onTouchEvent receives further ACTION_MOVE events, proceed to handle the drag
+     *
+     * For cases 2) and 3), lifting the active pointer at any point in the sequence of events triggers #onTouchEnd and the draggedItem, if detecting, is
+     * #stopDetecting.
+     */
 
 
     @Override
diff --git a/opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java b/opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java
index 09e4045a5..a92f292b2 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java
@@ -384,8 +384,8 @@ private void updateView()
     {
         /*
          * If the model loads very slowly then this function may be called after onDetach. In this case check if Activity is <code>null</code> and return if
-		 * <code>true</code>. Also return if we don't have values or the values are still loading.
-		 */
+         * <code>true</code>. Also return if we don't have values or the values are still loading.
+         */
         Activity activity = getActivity();
         if (activity == null || mValues == null || mValues.isLoading())
         {
@@ -569,9 +569,9 @@ public void onContentLoaded(ContentSet contentSet)
                 Sources.loadModelAsync(mAppContext, contentSet.getAsString(Tasks.ACCOUNT_TYPE), EditTaskFragment.this);
             }
 
-			/*
+            /*
              * Don't start the model loader here, let onItemSelected do that.
-			 */
+             */
             setListUri(TaskLists.getContentUri(mAuthority), LIST_LOADER_VISIBLE_LISTS_FILTER);
         }
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java b/opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java
index 878d6907d..df8bc46f2 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java
@@ -161,7 +161,7 @@ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition
             }
             /*
              * In contrast to a ListView an ExpandableListView does not set the activated item on it's own. So we have to do that here.
-			 */
+             */
             setActivatedItem(groupPosition, childPosition);
             return true;
         }
diff --git a/opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java b/opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java
index 26995435a..37f1a2d2e 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java
@@ -128,7 +128,7 @@ public void onDelete(Uri taskUri)
     {
         /*
          * The task we're showing has been deleted, just finish.
-		 */
+         */
         finish();
     }
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java b/opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java
index d216c62c6..8ef24ad05 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/ViewTaskFragment.java
@@ -370,7 +370,7 @@ public void loadUri(Uri uri)
         {
             /*
              * Unregister the observer for any previously shown task first.
-			 */
+             */
             mAppContext.getContentResolver().unregisterContentObserver(mObserver);
             persistTask();
         }
@@ -381,7 +381,7 @@ public void loadUri(Uri uri)
         {
             /*
              * Create a new ContentSet and load the values for the given Uri. Also register listener and observer for changes in the ContentSet and the Uri.
-			 */
+             */
             mContentSet = new ContentSet(uri);
             mContentSet.addOnChangeListener(this, null, true);
             mAppContext.getContentResolver().registerContentObserver(uri, false, mObserver);
@@ -391,7 +391,7 @@ public void loadUri(Uri uri)
         {
             /*
              * Immediately update the view with the empty task uri, i.e. clear the view.
-			 */
+             */
             mContentSet = null;
             if (mContent != null)
             {
@@ -403,7 +403,7 @@ public void loadUri(Uri uri)
         {
             /*
              * getActivity().invalidateOptionsMenu() doesn't work in Android 2.x so use the compat lib
-			 */
+             */
             ActivityCompat.invalidateOptionsMenu(getActivity());
         }
 
@@ -494,7 +494,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
     {
         /*
          * Don't show any options if we don't have a task to show.
-		 */
+         */
         if (mTaskUri != null)
         {
             menu = mToolBar.getMenu();
diff --git a/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetProvider.java b/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetProvider.java
index 3ed3559fe..31775b5b4 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetProvider.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetProvider.java
@@ -145,7 +145,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
     {
         /*
          * Iterate over all the widgets of this type and update them individually.
-		 */
+         */
         for (int i = 0; i < appWidgetIds.length; i++)
         {
             Log.d(TAG, "updating widget " + i);
@@ -186,7 +186,7 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
 
             widget.setPendingIntentTemplate(R.id.task_list_widget_lv, clickPI);
 
-			/* Finally update the widget */
+            /* Finally update the widget */
             appWidgetManager.updateAppWidget(appWidgetIds[i], widget);
         }
     }
diff --git a/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetProviderLegacy.java b/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetProviderLegacy.java
index 0aeb31f98..eb8f2e2e4 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetProviderLegacy.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/homescreen/TaskListWidgetProviderLegacy.java
@@ -137,9 +137,9 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
                 }
             }
 
-			/*
+            /*
              * Create and set a {@link PendingIntent} to view the task when the list is clicked.
-			 */
+             */
             Intent itemClickIntent = new Intent();
             itemClickIntent.setAction(Intent.ACTION_VIEW);
             itemClickIntent.putExtra(TaskListActivity.EXTRA_FORCE_LIST_SELECTION, true);
diff --git a/opentasks/src/main/java/org/dmfs/tasks/model/ContentSet.java b/opentasks/src/main/java/org/dmfs/tasks/model/ContentSet.java
index 202291055..486ff5193 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/model/ContentSet.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/model/ContentSet.java
@@ -304,12 +304,12 @@ public void ensureUpdates(Set<String> keys)
         ContentValues tempValues = new ContentValues(mBeforeContentValues);
         /*
          * Remove all values from tempValues that already are in mAfterContentValues or that are not required to be updated.
-		 * 
-		 * This is tricky because we can't rely on ContentValues.keySet(). That's why we have to iterate all keys and remove the ones we don't have to update.
-		 * Since we can't modify tempValues while iterating over its keys we have to create a temporary Set.
-		 * 
-		 * TODO: find a better way to solve this
-		 */
+         *
+         * This is tricky because we can't rely on ContentValues.keySet(). That's why we have to iterate all keys and remove the ones we don't have to update.
+         * Since we can't modify tempValues while iterating over its keys we have to create a temporary Set.
+         *
+         * TODO: find a better way to solve this
+         */
         for (Entry<String, Object> entry : new HashSet<Entry<String, Object>>(tempValues.valueSet()))
         {
             String key = entry.getKey();
diff --git a/opentasks/src/main/java/org/dmfs/tasks/model/DefaultModel.java b/opentasks/src/main/java/org/dmfs/tasks/model/DefaultModel.java
index 060942e37..f49fd8af1 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/model/DefaultModel.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/model/DefaultModel.java
@@ -73,9 +73,9 @@ public void inflate()
 
         Context context = getContext();
 
-		/*
+        /*
          * Add a couple of fields to the model.
-		 */
+         */
         // task list color
         addField(new FieldDescriptor(context, R.id.task_field_list_color, R.string.task_list, null, TaskFieldAdapters.LIST_COLOR)
                 .setViewLayout(LIST_COLOR_VIEW).setEditorLayout(LIST_COLOR_VIEW).setNoAutoAdd(true));
diff --git a/opentasks/src/main/java/org/dmfs/tasks/model/Sources.java b/opentasks/src/main/java/org/dmfs/tasks/model/Sources.java
index 929e97e04..e1740ecd3 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/model/Sources.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/model/Sources.java
@@ -309,9 +309,9 @@ public void onAccountsUpdated(Account[] accounts)
     {
         // the account list has changed, rebuild model map
 
-		/*
+        /*
          * FIXME: Do we have to rebuild the model map? An account was added not a new model. Instead we could cache the existing accounts and update it here.
-		 */
+         */
         getAccounts();
     }
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/model/TimeZoneChoicesAdapter.java b/opentasks/src/main/java/org/dmfs/tasks/model/TimeZoneChoicesAdapter.java
index 235afe117..69ba78961 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/model/TimeZoneChoicesAdapter.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/model/TimeZoneChoicesAdapter.java
@@ -62,9 +62,9 @@ public TimeZoneChoicesAdapter(Context context)
         String[] titles = resources.getStringArray(R.array.timezone_labels);
         String[] ids = resources.getStringArray(R.array.timezone_values);
 
-		/*
+        /*
          * Build time zone lists and maps.
-		 */
+         */
         for (int i = 0; i < ids.length; ++i)
         {
             String id = ids[i];
diff --git a/opentasks/src/main/java/org/dmfs/tasks/model/XmlModel.java b/opentasks/src/main/java/org/dmfs/tasks/model/XmlModel.java
index 48a734fde..ae2e5156f 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/model/XmlModel.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/model/XmlModel.java
@@ -522,7 +522,7 @@ public FieldInflater addEditLayoutOption(String key, int value)
     {
         /*
          * Add definitions for all supported fields:
-		 */
+         */
 
         FIELD_INFLATER_MAP.put("title", new FieldInflater(TaskFieldAdapters.TITLE, R.id.task_field_title, R.string.task_title, -1, R.layout.text_field_editor,
                 R.drawable.ic_detail_description).addEditLayoutOption(LayoutDescriptor.OPTION_MULTILINE, false));
diff --git a/opentasks/src/main/java/org/dmfs/tasks/model/adapters/TimeZoneWrapper.java b/opentasks/src/main/java/org/dmfs/tasks/model/adapters/TimeZoneWrapper.java
index 1eac66a58..14f726146 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/model/adapters/TimeZoneWrapper.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/model/adapters/TimeZoneWrapper.java
@@ -186,7 +186,7 @@ public int hashCode()
     {
         /*
          * Return the raw offset as hash code. It satisfies the requirements of a hash values: Time zones that are equal have the same raw offset.
-		 */
+         */
         return getRawOffset();
     }
 
@@ -201,14 +201,14 @@ public boolean equals(Object object)
 
         TimeZone otherTimeZone = (TimeZone) object;
 
-		/*
-		 * This is a very simple check for equality of two time zones. It returns the wrong result if two time zones have the same UTC offset, but use different
-		 * dates to switch to summer time.
-		 * 
-		 * Are there such cases? How can we improve it? Maybe by testing a few more days in March and October?
-		 * 
-		 * TODO: improve the check
-		 */
+        /*
+         * This is a very simple check for equality of two time zones. It returns the wrong result if two time zones have the same UTC offset, but use different
+         * dates to switch to summer time.
+         *
+         * Are there such cases? How can we improve it? Maybe by testing a few more days in March and October?
+         *
+         * TODO: improve the check
+         */
         return (mTimeZone.getID().equals(otherTimeZone.getID()))
                 || (mTimeZone.useDaylightTime() == otherTimeZone.useDaylightTime() && mTimeZone.getRawOffset() == otherTimeZone.getRawOffset()
                 && mTimeZone.getDSTSavings() == otherTimeZone.getDSTSavings() && mTimeZone.inDaylightTime(TEST_DATE) == otherTimeZone.inDaylightTime(
diff --git a/opentasks/src/main/java/org/dmfs/tasks/notification/NotificationUpdaterService.java b/opentasks/src/main/java/org/dmfs/tasks/notification/NotificationUpdaterService.java
index 34d79f02e..a74c5bc54 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/notification/NotificationUpdaterService.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/notification/NotificationUpdaterService.java
@@ -522,10 +522,10 @@ private void resolveUndoAction(Intent intent)
             return;
         }
 
-		/*
+        /*
          * Grab the alarm from the intent. Since the remote AlarmManagerService fills in the Intent to add some extra data, it must unparcel the
-		 * NotificationAction object. It throws a ClassNotFoundException when unparcelling. To avoid this, do the marshalling ourselves.
-		 */
+         * NotificationAction object. It throws a ClassNotFoundException when unparcelling. To avoid this, do the marshalling ourselves.
+         */
         final NotificationAction notificationAction;
         final String action = intent.getAction();
         final byte[] data = intent.getByteArrayExtra(NotificationActionUtils.EXTRA_NOTIFICATION_ACTION);
diff --git a/opentasks/src/main/java/org/dmfs/tasks/utils/BaseActivity.java b/opentasks/src/main/java/org/dmfs/tasks/utils/BaseActivity.java
index b1f038889..3c63c498d 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/utils/BaseActivity.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/utils/BaseActivity.java
@@ -85,7 +85,7 @@ protected void onPause()
         super.onPause();
         /*
          * On older SDK version we have to store permanent data in onPause(), because there is no guarantee that onStop() will be called.
-		 */
+         */
         if (VERSION.SDK_INT < VERSION_CODES.HONEYCOMB)
         {
             RetentionMagic.persist(this, mPrefs);
diff --git a/opentasks/src/main/java/org/dmfs/tasks/utils/ExpandableChildDescriptor.java b/opentasks/src/main/java/org/dmfs/tasks/utils/ExpandableChildDescriptor.java
index 75ffc8859..74ff67b7d 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/utils/ExpandableChildDescriptor.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/utils/ExpandableChildDescriptor.java
@@ -97,9 +97,9 @@ public CursorLoader getCursorLoader(Context context, Cursor cursor, AbstractFilt
         {
             /*
              * The columns in cursor may be null, but the selection arguments for the CursorLoader must be non-null.
-			 * 
-			 * To fix that we scan the selection string for question marks and replace them by "null" if the corresponding selection argument is null.
-			 */
+             *
+             * To fix that we scan the selection string for question marks and replace them by "null" if the corresponding selection argument is null.
+             */
 
             int pos = 0;
             int newPos;
diff --git a/opentasks/src/main/java/org/dmfs/tasks/utils/FlingDetector.java b/opentasks/src/main/java/org/dmfs/tasks/utils/FlingDetector.java
index fdd9e0741..8c1c5ac85 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/utils/FlingDetector.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/utils/FlingDetector.java
@@ -244,7 +244,7 @@ public boolean onTouch(View v, MotionEvent event)
                         mFlinging = false;
                         /*
                          * don't set handled = true, that would stop the touch event making it impossible to select a flingable list element
-						 */
+                         */
 
                         // start vibration detection
                         mHandler.postDelayed(mVibrateRunnable, ViewConfiguration.getTapTimeout());
diff --git a/opentasks/src/main/java/org/dmfs/tasks/utils/SearchHistoryDatabaseHelper.java b/opentasks/src/main/java/org/dmfs/tasks/utils/SearchHistoryDatabaseHelper.java
index 623f1b063..c94b44121 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/utils/SearchHistoryDatabaseHelper.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/utils/SearchHistoryDatabaseHelper.java
@@ -78,28 +78,28 @@ public interface SearchHistoryColumns
     static final String SEARCH_HISTORY_TABLE = "search_history";
 
     // @formatter:off
-	private final static String SQL_CREATE_SEARCH_HISTORY_TABLE =
-		"CREATE TABLE " + SEARCH_HISTORY_TABLE + " ( "
-			+ SearchHistoryColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
-			+ SearchHistoryColumns.SEARCH_QUERY + " TEXT, "
-			+ SearchHistoryColumns.HISTORIC + " INTEGER DEFAULT 0,"
-			+ SearchHistoryColumns.TIMESTAMP + " INTEGER DEFAULT 0"
-			+ " )";
-	// @formatter:on
+    private final static String SQL_CREATE_SEARCH_HISTORY_TABLE =
+        "CREATE TABLE " + SEARCH_HISTORY_TABLE + " ( "
+            + SearchHistoryColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + SearchHistoryColumns.SEARCH_QUERY + " TEXT, "
+            + SearchHistoryColumns.HISTORIC + " INTEGER DEFAULT 0,"
+            + SearchHistoryColumns.TIMESTAMP + " INTEGER DEFAULT 0"
+            + " )";
+    // @formatter:on
 
     // @formatter:off
-	private final static String SQL_CREATE_SEARCH_HISTORY_ADD_TRIGGER =
-		"CREATE TRIGGER search_history_add_trigger AFTER INSERT ON " + SEARCH_HISTORY_TABLE + " BEGIN "
-			// remove old entries
-			+ " DELETE FROM " + SEARCH_HISTORY_TABLE + " WHERE " + SearchHistoryColumns._ID + " not in"
-				+ "("
-					+ " select " + SearchHistoryColumns._ID + " from " + SEARCH_HISTORY_TABLE + " order by " + SearchHistoryColumns._ID + " desc limit " + SEARCH_HISTORY_SIZE
-				+ ");"
-			// mark all existing entries as historic
-			+ " UPDATE " + SEARCH_HISTORY_TABLE + " SET " + SearchHistoryColumns.HISTORIC + "=1 " +  " WHERE "
-				+ SearchHistoryColumns._ID + " <  new." + SearchHistoryColumns._ID + " AND " + SearchHistoryColumns.HISTORIC + "=0 ;"
-			+ " END";
-	// @formatter:on
+    private final static String SQL_CREATE_SEARCH_HISTORY_ADD_TRIGGER =
+        "CREATE TRIGGER search_history_add_trigger AFTER INSERT ON " + SEARCH_HISTORY_TABLE + " BEGIN "
+            // remove old entries
+            + " DELETE FROM " + SEARCH_HISTORY_TABLE + " WHERE " + SearchHistoryColumns._ID + " not in"
+                + "("
+                    + " select " + SearchHistoryColumns._ID + " from " + SEARCH_HISTORY_TABLE + " order by " + SearchHistoryColumns._ID + " desc limit " + SEARCH_HISTORY_SIZE
+                + ");"
+            // mark all existing entries as historic
+            + " UPDATE " + SEARCH_HISTORY_TABLE + " SET " + SearchHistoryColumns.HISTORIC + "=1 " +  " WHERE "
+                + SearchHistoryColumns._ID + " <  new." + SearchHistoryColumns._ID + " AND " + SearchHistoryColumns.HISTORIC + "=0 ;"
+            + " END";
+    // @formatter:on
 
 
     public SearchHistoryDatabaseHelper(Context context)
diff --git a/opentasks/src/main/java/org/dmfs/tasks/utils/WidgetConfigurationDatabaseHelper.java b/opentasks/src/main/java/org/dmfs/tasks/utils/WidgetConfigurationDatabaseHelper.java
index a9136c4a0..eafd345b2 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/utils/WidgetConfigurationDatabaseHelper.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/utils/WidgetConfigurationDatabaseHelper.java
@@ -75,17 +75,17 @@ public interface WidgetConfigurationColumns
     static final String WIDGET_CONFIGURATION_TABLE = "widget_config";
 
     // @formatter:off
-	private final static String SQL_CREATE_WIDGET_CONFIGURATION_TABLE =
-		"CREATE TABLE " + WIDGET_CONFIGURATION_TABLE + " ( "
-			+ WidgetConfigurationColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
-			+ WidgetConfigurationColumns.WIDGET_ID + " INTEGER, "
-			+ WidgetConfigurationColumns.LIST_ID + " INTEGER,  UNIQUE ( " + WidgetConfigurationColumns.WIDGET_ID + ", " + WidgetConfigurationColumns.LIST_ID + " ) ON CONFLICT IGNORE )";
-	// @formatter:on
+    private final static String SQL_CREATE_WIDGET_CONFIGURATION_TABLE =
+        "CREATE TABLE " + WIDGET_CONFIGURATION_TABLE + " ( "
+            + WidgetConfigurationColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + WidgetConfigurationColumns.WIDGET_ID + " INTEGER, "
+            + WidgetConfigurationColumns.LIST_ID + " INTEGER,  UNIQUE ( " + WidgetConfigurationColumns.WIDGET_ID + ", " + WidgetConfigurationColumns.LIST_ID + " ) ON CONFLICT IGNORE )";
+    // @formatter:on
 
     // @formatter:off
-	private static final String SQL_DELETE_CONFIGURATION_TABLE =
-	    "DROP TABLE IF EXISTS " + WIDGET_CONFIGURATION_TABLE;
-	// @formatter:on
+    private static final String SQL_DELETE_CONFIGURATION_TABLE =
+        "DROP TABLE IF EXISTS " + WIDGET_CONFIGURATION_TABLE;
+    // @formatter:on
 
 
     public WidgetConfigurationDatabaseHelper(Context context)
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldEditor.java b/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldEditor.java
index 22f1bce9a..26228d125 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldEditor.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldEditor.java
@@ -90,7 +90,7 @@ protected void onFinishInflate()
         {
             /*
              * enable memory leak workaround on android < 4.3: disable spell checker
-			 */
+             */
             int inputType = mText.getInputType();
             mText.setInputType(inputType | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         }
@@ -258,9 +258,9 @@ public CheckItemTag(ViewGroup viewGroup, int index)
             viewGroup.setTag(this);
             this.index = index;
 
-			/*
-			 * enable memory leak workaround on android < 4.3: disable spell checker
-			 */
+            /*
+             * enable memory leak workaround on android < 4.3: disable spell checker
+             */
             if (VERSION.SDK_INT < 18)
             {
                 int inputType = mText.getInputType();
@@ -269,7 +269,7 @@ public CheckItemTag(ViewGroup viewGroup, int index)
 
             checkbox.setOnCheckedChangeListener(CheckListFieldEditor.this);
 
-			/* unfortunately every EditText needs a separate TextWatcher, we only use this to add a new line once the last one is written to */
+            /* unfortunately every EditText needs a separate TextWatcher, we only use this to add a new line once the last one is written to */
             editText.addTextChangedListener(new TextWatcher()
             {
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldView.java b/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldView.java
index 0ee1b4eb7..b638435c3 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldView.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/CheckListFieldView.java
@@ -301,9 +301,9 @@ public void afterTextChanged(Editable s)
             }
         });
 
-		/*
+        /*
          * enable memory leak workaround on android < 4.3: disable spell checker
-		 */
+         */
         if (VERSION.SDK_INT < 18)
         {
             int inputType = text.getInputType();
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/TaskEdit.java b/opentasks/src/main/java/org/dmfs/tasks/widget/TaskEdit.java
index 188d6463b..e9e57b19c 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/TaskEdit.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/TaskEdit.java
@@ -61,9 +61,9 @@ public void setModel(Model model)
         Model mModel = model;
         final LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-		/*
+        /*
          * Add an editor for every field that is supported by this model.
-		 */
+         */
         for (FieldDescriptor field : mModel.getFields())
         {
             if (field.autoAdd())
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/TaskView.java b/opentasks/src/main/java/org/dmfs/tasks/widget/TaskView.java
index b6887831a..d0b1caeb4 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/TaskView.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/TaskView.java
@@ -74,9 +74,9 @@ public void setModel(Model model)
 
         final LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-		/*
+        /*
          * Add a detail view for every field that is supported by this model.
-		 */
+         */
         for (FieldDescriptor field : model.getFields())
         {
             if (mAddedFields.get(field.getFieldId(), -1) == -1 && field.autoAdd())
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/TextFieldEditor.java b/opentasks/src/main/java/org/dmfs/tasks/widget/TextFieldEditor.java
index 88683c555..805b70944 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/TextFieldEditor.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/TextFieldEditor.java
@@ -79,7 +79,7 @@ protected void onFinishInflate()
         {
             /*
              * enable memory leak workaround on android < 4.3: disable spell checker
-			 */
+             */
 
             int inputType = mText.getInputType();
             if (Build.VERSION.SDK_INT < 18)
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java b/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java
index f03c048e0..0c5dae5ee 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldEditor.java
@@ -242,7 +242,7 @@ private void applyTimeInTimeZone(Time time, String timeZone)
         {
             /*
              * Switch to timeZone and reset back to original time zone. That updates date & time to the values in timeZone but keeps the original time zone.
-			 */
+             */
             String originalTimeZone = time.timezone;
             time.switchTimezone(timeZone);
             time.timezone = originalTimeZone;
@@ -298,23 +298,23 @@ public void onContentChanged(ContentSet contentSet)
             if (mDateTime != null && mDateTime.timezone != null && !TextUtils.equals(mDateTime.timezone, newTime.timezone) && !newTime.allDay)
             {
                 /*
-				 * Time zone has been changed.
-				 * 
-				 * We don't want to change date and hour in the editor, so apply the old time zone.
-				 */
+                 * Time zone has been changed.
+                 *
+                 * We don't want to change date and hour in the editor, so apply the old time zone.
+                 */
                 applyTimeInTimeZone(newTime, mDateTime.timezone);
             }
 
             if (mDateTime != null && mDateTime.allDay != newTime.allDay)
             {
                 /*
-				 * The all-day flag has been changed, we may have to restore time and time zone for the UI.
-				 */
+                 * The all-day flag has been changed, we may have to restore time and time zone for the UI.
+                 */
                 if (!newTime.allDay)
                 {
                     /*
-					 * Try to restore the time or set a reasonable time if we didn't have any before.
-					 */
+                     * Try to restore the time or set a reasonable time if we didn't have any before.
+                     */
                     if (mOldHour >= 0 && mOldMinutes >= 0)
                     {
                         newTime.hour = mOldHour;
@@ -328,10 +328,10 @@ public void onContentChanged(ContentSet contentSet)
                         newTime.minute = defaultDate.minute;
                     }
                     /*
-					 * All-day events are floating and have no time zone (though it might be set to UTC).
-					 * 
-					 * Restore previous time zone if possible, otherwise pick a reasonable default value.
-					 */
+                     * All-day events are floating and have no time zone (though it might be set to UTC).
+                     *
+                     * Restore previous time zone if possible, otherwise pick a reasonable default value.
+                     */
                     newTime.timezone = mTimezone == null ? TimeZone.getDefault().getID() : mTimezone;
                     newTime.normalize(true);
                 }
@@ -349,9 +349,9 @@ public void onContentChanged(ContentSet contentSet)
                 mTimezone = newTime.timezone;
             }
 
-			/*
-			 * Update UI. Ensure we show the time in the correct time zone.
-			 */
+            /*
+             * Update UI. Ensure we show the time in the correct time zone.
+             */
             Date currentDate = new Date(newTime.toMillis(false));
             TimeZone timeZone = TimeZone.getTimeZone(newTime.timezone);
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldView.java b/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldView.java
index d7db6cbfe..ea696336d 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldView.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/TimeFieldView.java
@@ -157,7 +157,7 @@ public void onContentChanged(ContentSet contentSet)
                 {
                     /*
                      * The date has a time zone that is different from the default time zone, so show the original time too.
-					 */
+                     */
                     mDefaultDateFormat.setTimeZone(taskTimeZone);
                     mDefaultTimeFormat.setTimeZone(taskTimeZone);
 
diff --git a/opentasks/src/main/java/org/dmfs/tasks/widget/UrlFieldEditor.java b/opentasks/src/main/java/org/dmfs/tasks/widget/UrlFieldEditor.java
index 2ab7ac96f..fad0a6e77 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/widget/UrlFieldEditor.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/widget/UrlFieldEditor.java
@@ -82,9 +82,9 @@ protected void onFinishInflate()
         {
             mText.addTextChangedListener(this);
 
-			/*
+            /*
              * enable memory leak workaround on android < 4.3: disable spell checker
-			 */
+             */
             int inputType = mText.getInputType();
             if (VERSION.SDK_INT < 18)
             {