diff --git a/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
index 589c389..a9382e8 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
@@ -204,9 +204,8 @@ public class SmsFetcher {
                     String colName;
 					for (int idx = 0; idx < c.getColumnCount(); idx++) {
 						colName = c.getColumnName(idx);
-						
-						// Id column is must be an integer
                         switch (colName) {
+                            // Id column is must be an integer
                             case "_id":
                             case "type":
                                 entry.put(colName, c.getInt(idx));
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java b/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java
index 04ecbd1..4d6d9ae 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java
@@ -46,44 +46,30 @@ public class SmsDataProvider extends ContentProvider {
 				);
 	}
 
-	public Cursor query(String mailBox, String selection) {
-		return query(Uri.parse(mailBox),
-				new String[] { "read", "date", "address", "seen", "body", "_id", "type", },
-				selection, null, null
-				);
-	}
-
 	public Cursor queryNonExistingMessages(String mailBox, String existingIds) {
 		if (!existingIds.isEmpty()) {
-            return query(mailBox, "_id NOT IN (" + existingIds + ")");
+            return query(Uri.parse(mailBox),
+                    new String[] { "read", "date", "address", "seen", "body", "_id", "type", },
+                    "_id NOT IN (" + existingIds + ")", null, null
+            );
 		}
 
 		return query(mailBox);
 	}
 
     public Cursor queryMessagesSinceDate(String mailBox, Long sinceDate) {
-        OCSMSSharedPrefs prefs = new OCSMSSharedPrefs(_context);
-        Integer bulkLimit = prefs.getSyncBulkLimit();
-        String bulkStr = "";
-        if (bulkLimit > 0) {
-            bulkStr = "LIMIT " + bulkLimit.toString();
-        }
-
-        return query(mailBox, "date > ?", new String[] { sinceDate.toString() });
+        return query(Uri.parse(mailBox),
+                new String[] { "read", "date", "address", "seen", "body", "_id", "type", },
+                "date > ?", new String[] { sinceDate.toString() }, null
+        );
     }
 
-	public Cursor query(String mailBox, String selection, String[] selectionArgs) {
-		return query(Uri.parse(mailBox),
-				new String[] { "read", "date", "address", "seen", "body", "_id", "type", },
-				selection, selectionArgs, null
-				);
-	}
-
 	@Override
 	public Cursor query(@NonNull Uri uri, String[] projection, String selection,
 			String[] selectionArgs, String sortOrder) {
         OCSMSSharedPrefs prefs = new OCSMSSharedPrefs(_context);
         Integer bulkLimit = prefs.getSyncBulkLimit();
+        //Integer senderMinSize = prefs.getMinPhoneNumberCharsToSync();
         if (bulkLimit > 0) {
             if (sortOrder == null)
                 sortOrder = "_id ";