diff --git a/build.gradle b/build.gradle
index 0616f2e..7e5df02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
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 2173c1f..1ec6412 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
@@ -38,7 +38,7 @@ public class SmsFetcher {
 		_existingDraftsMessages = null;
 	}
 	
-	public void fetchAllMessages(JSONArray result) {
+	void fetchAllMessages(JSONArray result) {
 		bufferMailboxMessages(result, MailboxID.INBOX);
 		bufferMailboxMessages(result, MailboxID.SENT);
 		bufferMailboxMessages(result, MailboxID.DRAFTS);
@@ -188,7 +188,7 @@ public class SmsFetcher {
 	}
 	
 	// Used by ConnectivityChanged Event
-	public void bufferMessagesSinceDate(JSONArray result, MailboxID mbID, Long sinceDate) {
+    private void bufferMessagesSinceDate(JSONArray result, MailboxID mbID, Long sinceDate) {
 		String mbURI = mapMailboxIDToURI(mbID);
 		
 		if ((_context == null) || (mbURI == null)) {
@@ -298,19 +298,19 @@ public class SmsFetcher {
         return sb.toString();
 	}
 	
-	public void setExistingInboxMessages(JSONArray inboxMessages) {
+	void setExistingInboxMessages(JSONArray inboxMessages) {
 		_existingInboxMessages = inboxMessages;
 	}
 
-	public void setExistingSentMessages(JSONArray sentMessages) {
+	void setExistingSentMessages(JSONArray sentMessages) {
 		_existingSentMessages = sentMessages;
 	}
 
-	public void setExistingDraftsMessages(JSONArray draftMessages) {
+	void setExistingDraftsMessages(JSONArray draftMessages) {
 		_existingDraftsMessages = draftMessages;
 	}
 	
-	public Long getLastMessageDate() {
+	Long getLastMessageDate() {
 		return _lastMsgDate;
 	}