diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index c82c435..d289b13 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="fr.unix_experience.owncloud_sms"
           xmlns:android="http://schemas.android.com/apk/res/android"
-          android:versionCode="34"
-          android:versionName="0.20.1"> <!-- From Android 4.0 to 6.0 -->
+          android:versionCode="35"
+          android:versionName="0.21.0"> <!-- From Android 4.0 to 6.0 -->
     <uses-sdk
         android:maxSdkVersion="23"
         android:minSdkVersion="14"
@@ -30,10 +30,7 @@
     <!-- For backup restauration -->
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
-
-    <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <android:uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
     <application
         android:allowBackup="true"
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/virtual/VirtualSettingsActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/virtual/VirtualSettingsActivity.java
index 89de2e6..865660e 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/activities/virtual/VirtualSettingsActivity.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/virtual/VirtualSettingsActivity.java
@@ -50,7 +50,7 @@ public class VirtualSettingsActivity extends PreferenceActivity {
 	protected static Vector<BindObjectPref> _boolPrefs = new Vector<>();
 	protected static Vector<BindObjectPref> _stringPrefs = new Vector<>();
 
-	@Override
+    @Override
 	protected void onPostCreate(Bundle savedInstanceState) {
 		super.onPostCreate(savedInstanceState);
         VirtualSettingsActivity._context = getBaseContext();
@@ -148,17 +148,18 @@ public class VirtualSettingsActivity extends PreferenceActivity {
 	 * activity is showing a two-pane settings UI.
 	 */
 	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-	public class DataSyncPreferenceFragment extends PreferenceFragment {
+	public static class DataSyncPreferenceFragment extends PreferenceFragment {
 		@Override
 		public void onCreate(Bundle savedInstanceState) {
 			super.onCreate(savedInstanceState);
 			addPreferencesFromResource(VirtualSettingsActivity._prefsRessourceFile);
 
-            bindPreferences();
+            VirtualSettingsActivity a = (VirtualSettingsActivity) getActivity();
+            a.bindPreferences();
 		}
 	}
 
-	private void bindPreferences() {
+	public void bindPreferences() {
 		// Bind the summaries of EditText/List/Dialog/Ringtone preferences to
 		// their values. When their values change, their summaries are updated
 		// to reflect the new value, per the Android Design guidelines.
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index b04bd2a..d9e6523 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -134,7 +134,6 @@
     <!-- Main activity -->
     <string name="ma_title_rate_us">Ohodnoťit!</string>
     <string name="ma_title_add_account">Přidat účet</string>
-    <string name="ma_title_change_settings">Změnit nastavení aplikace</string>
     <string name="ma_title_welcome">Vítejte</string>
     <string name="ma_content_welcome">Vítejte v aplikaci ownCloud SMS. Tato aplikace umožnuje sychronizovat SMS do vašeho účtu na serveru ownCloud za pomoci aplikace pro SMS.</string>
     <string name="ma_title_remote_account">Vzdálený účet</string>
@@ -173,6 +172,4 @@
     <string name="subtitle_contact_phones">- Telefony kontaktu</string>
     <string name="pref_title_bulk_messages">Maximální počet zpráv pro odeslání na synchronizaci</string>
     <string name="contactinfos_list">Adresář</string>
-    <string name="no_account_configured"></string>
-    <string name="ma_button_goto_settings"></string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 7c5c7ac..d73cf82 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -129,6 +129,5 @@
 	<string name="err_sync_http_request_ioexception">Fehler #13: Konnte nicht mit der ownCloud-Instanz verbinden (IO-Fehler)</string>
 	<string name="err_sync_http_request_resp">Fehler #14: Konnte Server-Antwort nicht parsen</string>
 	<string name="err_sync_http_request_parse_resp">Fehler #15: Konnte Server-Antwort nicht parsen</string>
-    <string name="ma_button_goto_settings"></string>
 
 </resources>
diff --git a/src/main/res/values-en/strings.xml b/src/main/res/values-en/strings.xml
index a450e7b..5926e4a 100644
--- a/src/main/res/values-en/strings.xml
+++ b/src/main/res/values-en/strings.xml
@@ -122,11 +122,8 @@
     <!-- Main activity -->
     <string name="ma_title_rate_us">Rate us !</string>
     <string name="ma_title_add_account">Add an account</string>
-    <string name="ma_title_change_settings">Change app settings</string>
     <string name="ma_title_welcome">Welcome</string>
     <string name="ma_content_welcome">Welcome to ownCloud SMS application. This application let you synchronize your SMS to your ownCloud instance using SMS app.</string>
-    <string name="ma_thanksto_people">ownCloud developers\n\
-Contributors and issue\'s reporters</string>
 
     <!-- Notifications -->
     <string name="sync_title">Sync process</string>
@@ -162,7 +159,6 @@ Contributors and issue\'s reporters</string>
     <string name="no_account_configured">No account configured.</string>
     <string name="communicate">Communicate</string>
     <string name="ma_title_my_accounts">My accounts</string>
-    <string name="ma_button_goto_settings"></string>
     <string name="ma_content_swipeaction">Swipe from left to right to access to action menu.</string>
 
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index a2ac314..2654b16 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -91,5 +91,4 @@
 	<string name="sync_title">Proceso de sincronización</string>
 	<string name="sync_inprogress">Sincronización en progreso...</string>
 	<string name="fatal_error">Error Fatal ! </string>
-    <string name="ma_button_goto_settings"></string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index ed6d5df..1a64629 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -106,11 +106,8 @@
     <!-- Main activity -->
     <string name="ma_title_rate_us">Notez nous !</string>
     <string name="ma_title_add_account">Ajouter un compte</string>
-    <string name="ma_title_change_settings">Changer les paramètres de l\'application</string>
     <string name="ma_title_welcome">Bienvenue</string>
     <string name="ma_content_welcome">Bienvenue sur l\'application ownCloud SMS. Cette application va vous permettre de synchroniser vos SMS au sein de votre instance ownCloud en utilisant l\'application dédiée.</string>
-    <string name="ma_thanksto_people">L\'équipe de développement ownCloud\n\
-Les contributeurs et rapporteurs de bugs</string>
 
     <!-- Notifications -->
     <string name="sync_title">Processus de synchronisation</string>
@@ -147,6 +144,5 @@ Les contributeurs et rapporteurs de bugs</string>
     <string name="no_account_configured">Vous n\'avez pas configuré de compte.</string>
     <string name="communicate">Parlez de nous</string>
     <string name="ma_title_my_accounts">Mes comptes</string>
-    <string name="ma_button_goto_settings"></string>
     <string name="ma_content_swipeaction">Glissez votre doigt de gauche à droite pour afficher le menu.</string>
 </resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 4a9f2f6..44987a9 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -93,11 +93,8 @@
     <!-- Main activity -->
     <string name="ma_title_rate_us">Оцените нас!</string>
     <string name="ma_title_add_account">Додајте налог</string>
-    <string name="ma_title_change_settings">Измените поставке апликације</string>
     <string name="ma_title_welcome">Добро дошли</string>
     <string name="ma_content_welcome">Добро дошли у Оунклауд СМС. Ова апликација синхронизује ваше СМС поруке на СМС апликацију вашег Оунклауд сервера.</string>
-    <string name="ma_thanksto_people">Оунклауд програмерима\n\
-Доприносиоцима и људима који пријављују грешке</string>
 
     <!-- Notifications -->
     <string name="sync_title">Синхронизација</string>
@@ -121,6 +118,5 @@
     <string name="err_sync_http_request_parse_resp">Грешка #15: не могу да рашчланим одговор сервера</string>
     <string name="err_sync_no_connection_available">Грешка #16: нема везе на интернет</string>
     <string name="err_sync_account_unparsable">Грешка #17: деформисан налог. Поставите га поново</string>
-    <string name="ma_button_goto_settings"></string>
 
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index f598226..f631c13 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -109,10 +109,8 @@
 	<!-- Main activity -->
     <string name="ma_title_rate_us">Skriv en recension!</string>
     <string name="ma_title_add_account">Lägg till ett konto</string>
-    <string name="ma_title_change_settings">Ändra applikationsinställningar</string>
     <string name="ma_title_welcome">Välkommen</string>
 	<string name="ma_content_welcome">Välkommen till ownCloud SMS. Den här applikationen gör det möjligt att synkronisera dina SMS till din ownCloud-server.</string>
-	<string name="ma_thanksto_people">- Utvecklarna utav ownCloud\n\ - De som bidragit, och som anmält buggar</string>
 
     <!-- Notifications -->
 	<string name="sync_title">Synkroniseringsprocesss</string>
@@ -136,6 +134,4 @@
 	<string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string>
 	<string name="err_sync_no_connection_available">Error #16: No data connection available</string>
 	<string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string>
-    <string name="ma_button_goto_settings"></string>
-
 </resources>