diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..fea5b03
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
+
+    defaultConfig {
+        applicationId "fr.unix_experience.owncloud_sms"
+        minSdkVersion 14
+        targetSdkVersion 22
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile project(':owncloudAndroidLibrary')
+    compile project(':nrzandroidlib')
+    compile files('libs/android-support-v13.jar')
+}
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 2825263..00d067f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="fr.unix_experience.owncloud_sms"
-    android:versionCode="30"
-    android:versionName="0.19.1"> <!-- From Android 4.0 to 5.2 -->
+    android:versionCode="32"
+    android:versionName="0.19.3"> <!-- From Android 4.0 to 6.0 -->
     <uses-sdk
-        android:maxSdkVersion="22"
+        android:maxSdkVersion="23"
         android:minSdkVersion="14"
         android:targetSdkVersion="23" />
 
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java
index b06da75..a90138a 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java
@@ -6,7 +6,6 @@ import android.app.ListActivity;
 import android.os.Bundle;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 import fr.nrz.androidlib.adapters.AndroidAccountAdapter;
 import fr.unix_experience.owncloud_sms.R;
@@ -22,6 +21,7 @@ public class AccountListActivity extends ListActivity {
 		AccountManager _accountMgr = AccountManager.get(getBaseContext());
 
 		setContentView(R.layout.restore_activity_accountlist);
+        /*
 		adapter = new AndroidAccountAdapter(this,
 				android.R.layout.simple_list_item_1,
 				listItems,
@@ -34,6 +34,7 @@ public class AccountListActivity extends ListActivity {
         Collections.addAll(listItems, accountList);
 
 		adapter.notifyDataSetChanged();
+        */
 	}
 }
 
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 54d0665..589c389 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
@@ -274,9 +274,9 @@ public class SmsFetcher {
 			existingMessages = _existingSentMessages;
 		}
         
-	        if (existingMessages == null) {
-	        	return "";
-	        }
+        if (existingMessages == null) {
+            return "";
+        }
 
 		// Note: The default case isn't possible, we check the mailbox before
 		StringBuilder sb = new StringBuilder();
@@ -292,7 +292,7 @@ public class SmsFetcher {
             }
         }
 		
-		return sb.toString();
+        return sb.toString();
 	}
 	
 	public void setExistingInboxMessages(JSONArray inboxMessages) {
diff --git a/src/main/res/layout/fragment_mainactivity_gotosettings.xml b/src/main/res/layout/fragment_mainactivity_gotosettings.xml
index 259ffba..069f038 100644
--- a/src/main/res/layout/fragment_mainactivity_gotosettings.xml
+++ b/src/main/res/layout/fragment_mainactivity_gotosettings.xml
@@ -135,6 +135,6 @@
         android:layout_below="@+id/main_button_choose_account"
         android:layout_marginTop="33dp"
         android:src="@drawable/next_arrow" />
-    <!--  android:layout_below="@+id/main_button_sync" -->
+    <!--  android:layout_below="@+id/main_button_syncruir" -->
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/restore_activity_accountlist.xml b/src/main/res/layout/restore_activity_accountlist.xml
index 8dad873..3ecb674 100644
--- a/src/main/res/layout/restore_activity_accountlist.xml
+++ b/src/main/res/layout/restore_activity_accountlist.xml
@@ -30,10 +30,19 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent" >
 
-	<ListView
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="@string/function_not_available"
+        android:id="@+id/textView"
+        android:layout_gravity="center_horizontal"/>
+
+    <ListView
 	    android:id="@android:id/list"
 	    android:layout_width="fill_parent"
 	    android:layout_height="fill_parent"
-	    android:drawSelectorOnTop="true" />
+	    android:drawSelectorOnTop="true"
+        android:clickable="false"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/values-en/strings.xml b/src/main/res/values-en/strings.xml
index 6f6fd43..9396b42 100644
--- a/src/main/res/values-en/strings.xml
+++ b/src/main/res/values-en/strings.xml
@@ -165,5 +165,6 @@ Contributors and issue\'s reporters</string>
     <string name="subtitle_contact_phones">- Contact phones</string>
     <string name="pref_title_bulk_messages">Max messages to send per sync</string>
     <string name="contactinfos_list">Contact list</string>
+    <string name="function_not_available">This function is not available yet.</string>
 
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 80b4be0..71fd5d3 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -150,4 +150,5 @@ Les contributeurs et rapporteurs de bugs</string>
     <string name="err_sync_craft_http_request">Erreur #2: Echec de la création de la requête</string>
     <string name="pref_title_bulk_messages">Nombre maximum de messages à envoyer par synchronisation</string>
     <string name="contactinfos_list">Liste des contacts</string>
+    <string name="function_not_available">Cette fonctionnalité n\'est pas encore disponibleeems.</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 074ff88..d142eb2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -194,4 +194,5 @@ Contributors and issue\'s reporters</string>
     <string name="subtitle_contact_phones">- Contact phones</string>
     <string name="pref_title_bulk_messages">Max messages to send per sync</string>
     <string name="contactinfos_list">Contact list</string>
+    <string name="function_not_available">This function is not available yet.</string>
 </resources>