diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 1da7075ae8adbd562508da26f03809b57a071438..08dc5493644805575bd72d897db5705baa22a321 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -14,8 +14,8 @@
                         <option name="values">
                           <map>
                             <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_notes" />
-                            <entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/ic_notes.svg" />
+                            <entry key="outputName" value="ic_battery" />
+                            <entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/battery.svg" />
                           </map>
                         </option>
                       </PersistentState>
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 4d9f80324160804f74c144625da035ea1039d815..e27eb3d115adae4364d271495f957a9ea4ca6f62 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3e693252220e17a250fb47d9bc3ce18e1929d695..1be8a038dd19bb7c504a2ac44c7ea9c8c86558c7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:allowBackup="true"
@@ -15,10 +17,19 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/DisTheme">
+        <receiver
+            android:name=".StatusBroadcastReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
+        </receiver>
+
         <service
             android:name=".StatusService"
             android:enabled="true"
-            android:exported="true"></service>
+            android:exported="true" />
 
         <activity
             android:name=".ui.SplashScreenActivity"
diff --git a/app/src/main/java/org/disroot/disrootapp/StatusBroadcastReceiver.java b/app/src/main/java/org/disroot/disrootapp/StatusBroadcastReceiver.java
new file mode 100644
index 0000000000000000000000000000000000000000..fb9d2c3a8c43f28917658e4ecabd5a12f225e543
--- /dev/null
+++ b/app/src/main/java/org/disroot/disrootapp/StatusBroadcastReceiver.java
@@ -0,0 +1,16 @@
+package org.disroot.disrootapp;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class StatusBroadcastReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        Intent myIntent = new Intent(context, StatusService.class);
+        context.startService(myIntent);
+
+    }
+}
diff --git a/app/src/main/java/org/disroot/disrootapp/StatusService.java b/app/src/main/java/org/disroot/disrootapp/StatusService.java
index 486b23d0ad92ffc542da241ac2ef64398516f91c..72fd7ca46624c961c5cf5fe3fb1076a29cfe8cdd 100644
--- a/app/src/main/java/org/disroot/disrootapp/StatusService.java
+++ b/app/src/main/java/org/disroot/disrootapp/StatusService.java
@@ -101,7 +101,7 @@ public class StatusService extends Service {
                         checkDate.edit().putString( "storeDate", stateDate).apply();
                         //return null;
                     }
-                    else if (!stateDate.equals( dateStored )&& !stateDate.equals( "" ))//dateStored
+                    else if (!stateDate.equals( dateStored)&& !stateDate.equals( "" ))//dateStored
                     {
                         checkDate.edit().putString( "storeDate", stateDate).apply();
                         Log.e(TAG, "date: " + dateStored);
@@ -173,8 +173,6 @@ public class StatusService extends Service {
         notificationBuilder.setSound(alarmSound)
                 .setVibrate(new long[]{50,500,100,300,50,300})
                 .setLights(Color.BLUE, 3000, 3000);
-        NotificationManager mNotificationManager =
-                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
             notificationBuilder.setChannelId(CHANNEL_ID);
         }
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index fa4e290ff70aabcbac5b2d537c01c1a335043243..225ddc54c98594d23457c47cf00b358de32e08ce 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -4,9 +4,11 @@ import android.Manifest;
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.DownloadManager;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -16,7 +18,9 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Parcelable;
+import android.os.PowerManager;
 import android.provider.MediaStore;
+import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.Snackbar;
@@ -646,8 +650,31 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         Intent intent = new Intent( MainActivity.this, StatusService.class);
         startService(intent);
 
+
+
+        //delete after version 1.1.6
+        PackageInfo info = null;
+        try {
+            info = getPackageManager().getPackageInfo(getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            // bad times
+            Log.e("MyApplication", "couldn't get package info!");
+        }
+
+        if (info == null) {
+            // can't do anything
+            return;
+        }
+
+        if (!firstStart.getBoolean("update", false)&&info.firstInstallTime != info.lastUpdateTime) {
+            showOptimzationInfo();
+            firstStart.edit().putBoolean("update", true).apply();
+            return;
+        }
     }
 
+
+
     //Dialog windows
     private void showChoose() {
         AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
@@ -702,10 +729,41 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         builder.setCancelable(false);
         builder.setTitle(R.string.FirstTitle);
         builder.setMessage(getString(R.string.FirstInfo));
-        builder.setPositiveButton(R.string.global_ok, null);
+        builder.setPositiveButton(R.string.global_ok,  new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                showOptimzation();
+            }
+        });
         builder.show();
     }
 
+    private void showOptimzation() {
+                Intent intent = new Intent();
+                String packageName = getPackageName();
+                PowerManager pm = (PowerManager) getSystemService( Context.POWER_SERVICE);
+                if (pm.isIgnoringBatteryOptimizations(packageName))
+                    intent.setAction(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS);
+                else {
+                    intent.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                    intent.setData(Uri.parse("package:" + packageName));
+                }
+                startActivity(intent);
+    }
+
+    private void showOptimzationInfo() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+        builder.setCancelable(false);
+        builder.setTitle(R.string.OptimizationTitle);
+        builder.setMessage(getString(R.string.OptimizationInfo));
+        builder.setPositiveButton(R.string.global_ok,  new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                showOptimzation();
+            }
+        });
+        builder.show();
+    }
     @Override
     public boolean onLongClick(View view) {
         Toast.makeText(view.getContext(), R.string.activity_main_share_info, Toast.LENGTH_LONG).show();
@@ -1390,6 +1448,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                 webView.loadUrl(url);
                 return true;
             }
+            case R.id.action_optimization:
+                showOptimzation();
+                return true;
             case R.id.action_about:
                 Intent goAbout = new Intent(MainActivity.this, AboutActivity.class);
                 MainActivity.this.startActivity(goAbout);
@@ -1821,7 +1882,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         }
     }
 
-    //
     public void shareCurrentPage() {
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.setAction(Intent.ACTION_SEND);
diff --git a/app/src/main/res/drawable/ic_battery.xml b/app/src/main/res/drawable/ic_battery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e5383ec278fb35ec9706dfce37f3a6fa5120e50
--- /dev/null
+++ b/app/src/main/res/drawable/ic_battery.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="M19.8066,0C18.3843,0 17.2383,1.1599 17.2383,2.6016L17.2383,2.6758L13.7988,2.6758C11.9279,2.6758 10.4219,4.2053 10.4219,6.1016L10.4219,44.5781C10.4219,46.4744 11.9279,48 13.7988,48L33.7129,48C35.5838,48 37.0898,46.4744 37.0898,44.5781L37.0898,6.1016C37.0898,4.2053 35.5838,2.6758 33.7129,2.6758L30.3418,2.6758L30.3418,2.6016C30.3418,1.1599 29.1977,0 27.7754,0L19.8066,0zM20.3926,11.2773L26.252,11.2773C26.6985,11.2773 27.0566,11.6165 27.0566,12.0273C27.0566,12.1345 27.0204,12.2405 26.9668,12.3477L23.9121,20.6191L30.9863,18.8672C31.0578,18.8493 31.1297,18.832 31.2012,18.832C31.4334,18.832 31.6478,18.9388 31.8086,19.0996C32.0051,19.314 32.0586,19.6188 31.9336,19.8867L22.2871,40.5527C22.1442,40.8207 21.8586,41 21.5371,41C21.4657,41 21.3764,40.9828 21.2871,40.9648C20.8941,40.8398 20.6607,40.465 20.75,40.0898L24.2695,25.6563L17.0176,27.4609C16.9461,27.4788 16.8742,27.4785 16.8027,27.4785C16.6062,27.4785 16.3929,27.4063 16.25,27.2813C16.0357,27.1026 15.964,26.8341 16.0176,26.584L19.6074,11.8477C19.6967,11.5083 20.0175,11.2773 20.3926,11.2773z"
+        android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeWidth="0.99062097"/>
+</vector>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 1720097fd324bafdd5bef76665f01733ddc896dc..93309599f9575a3b650434d22ff2f86edb8d40fd 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -31,6 +31,10 @@
         android:icon="@drawable/ic_clear_cookies"
         android:id="@+id/action_clear_cookies"
         android:title="@string/action_clear_cookies" />
+        <item
+            android:icon="@drawable/ic_battery"
+            android:id="@+id/action_optimization"
+            android:title="@string/action_optimization" />
         <item
             android:icon="@drawable/ic_about"
             android:id="@+id/action_about"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1e46666933165d7dd9108b3cbc18152fbd20ff6a..8d3917db3bbd4fbcd1215a7e5b6e473705aec270 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -28,7 +28,7 @@
     <string name="view_loading_description">Cargando…</string>
     <string name="global_ok">OK</string>
     <string name="more_help">¿Necesitas más ayuda?</string>
-    <string name="tell_more">Cuéntame más...</string>
+    <string name="tell_more">Cuéntame más…</string>
     <string name="title_activity_about">AboutActivity</string>
 
     <string name="MailInfoTitle">Configuración de Correo:</string>
@@ -79,8 +79,8 @@
     <string name="SpreadTheWordTxt">Comenta a tus amigos y familia sobre Disroot. O por qué no escribir en un blog sobre tu experiencia. Nos encantaría conocerla.</string>
     <string name="SpreadTheWordBtn">Compartir la aplicación</string>
     <string name="DisrootWeb">Sitio de Disroot</string>
-    <string name="FirstTitle">Casi lo olvido…</string>
-    <string name="FirstInfo">Haciendo una presión larga sobre el ícono de cada aplicación, puedes ver información extra sobre ella.</string>
+    <string name="FirstTitle">Casi lo olvido…</string><!-- need update -->
+    <string name="FirstInfo">Haciendo una presión larga sobre el ícono de cada aplicación, puedes ver información extra sobre ella.</string><!-- need update -->
     <string name="DiasporaTitle">Configuración de Diaspora*</string>
     <string name="DiasporaInfo">Red social distribuida y descentralizada. Publica, comparte, crea comunidades.\nUsuario: tu_usuario_de_Diaspora@pod.disroot.org\nContraseña: tu_contraseña_de_diaspora</string>
     <string name="PadInfo">EtherPad</string>
@@ -118,7 +118,7 @@
     <string name="matrixBtn"> \ \ &#8226; Estado de Matrix</string>
     <string name="SocialBtn"> \ \ &#8226; Estado de Hubzilla/Diaspora*/Mastodon</string>
     <string name="NewsBtn"> \ \ &#8226; Actualización de estados por email</string>
-    <string name="RssBtn"> \ \ &#8226; Feed RSS de los Estados</string>
+    <string name="RssBtn">We recommend to turn off battery optimization and allow Disroot app to run in background. If you\'re not sure, you can always change the setting from the menu of the Disroot app later.</string>
     <string name="ChooseChatTitle">¡Tienes dos clientes XMPP instalados!</string>
     <string name="ChooseChat">Por favor, elige el cliente que quieres usar para Disroot</string>
     <string name="Remember">Recordar mi elección</string>
@@ -158,4 +158,7 @@
     <string name="NotesDialog">Para continuar, primero necesitas instalar Notas.\nPor favor, selecciona Instalar para continuar con la instalación desde F-Droid.</string>
     <string name="PadDialog">Para continuar, primero necesitas instalar Padland.\nPor favor, selecciona Instalar para continuar desde F-Droid.</string>
     <string name="do_you_want_to_exit">do you want to exit?</string>
+    <string name="action_optimization">Battery optimization</string>
+    <string name="OptimizationTitle">Battery optimization</string>
+    <string name="OptimizationInfo">With this update the app can sync with the status page of Disroot. This means you will receive realtime updates on issues, downtimes, scheduled maintenace and others published via https://state.disroot.org</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c6da1101c07eb876e18de5d338a64e2debcf4d86..13a5adaa8309af53ee060f1c19a3a2fa2ba44bc1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -101,8 +101,8 @@
     <string name="SpreadTheWordTxt">Parlez de Disroot à vos amis et à votre famille ! Pourquoi ne bloguez-vous pas sur vos expériences \? Nous adorerions recevoir de vos nouvelles !</string>
     <string name="SpreadTheWordBtn">Partager l\'application</string>
     <string name="DisrootWeb">Disroot web</string>
-    <string name="FirstTitle">J\'allais presque oublier</string>
-    <string name="FirstInfo">Vous pouvez appuyer longuement sur chaque icône pour afficher des informations supplémentaires …</string>
+    <string name="FirstTitle">J\'allais presque oublier</string><!-- need update -->
+    <string name="FirstInfo">Vous pouvez appuyer longuement sur chaque icône pour afficher des informations supplémentaires …</string><!-- need update -->
     <string name="DiasporaTitle">Paramètres Diaspora*</string>
     <string name="DiasporaInfo">Réseau social distribué et décentralisé. Postez, partagez, aimez, créez des communautés.
 \n
@@ -195,4 +195,7 @@
     <string name="action_notes">Notes</string>
     <string name="PadDialog">Pour continuer, vous devez d\'abord installer Padland.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
     <string name="do_you_want_to_exit">do you want to exit?</string>
+    <string name="action_optimization">Battery optimization</string>
+    <string name="OptimizationTitle">We recommend to turn off battery optimization and allow Disroot app to run in background. If you\'re not sure, you can always change the setting from the menu of the Disroot app later.</string>
+    <string name="OptimizationInfo">With this update the app can sync with the status page of Disroot. This means you will receive realtime updates on issues, downtimes, scheduled maintenace and others published via https://state.disroot.org</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 76bbd596a76c98fd98f949c2c51857e58febcd00..eaf25a7b327d5f6effcc608392bfb3a64e3a1f0a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -78,8 +78,8 @@
     <string name="SpreadTheWordTxt">Racconta ai tuoi amici e familiari di Disroot! Perché non scrivi sul tuo blog le tue esperienze? Ci farebbe molto piacere sentirti!</string>
     <string name="SpreadTheWordBtn">Condividi la app</string>
     <string name="DisrootWeb">Disroot web</string>
-    <string name="FirstTitle">Quasi dimenticavo</string>
-    <string name="FirstInfo">È possibile premere a lungo su ogni icona per visualizzare informazioni aggiuntive.…</string>
+    <string name="FirstTitle">Le Ultime cose!</string>
+    <string name="FirstInfo">&#8226; È possibile premere a lungo su ogni icona per visualizzare informazioni aggiuntive… \n\n&#8226; L\'applicazione può sincronizzarsi con la pagina di stato di Disroot. Questo significa che riceverai in tempo reale aggiornamenti su problemi, tempi di inattività, manutenzione programmata e altri aggiornamenti pubblicati su https://state.disroot.org\nSi consiglia di disattivare l\'ottimizzazione della batteria e consentire all\'applicazione Disroot di funzionare in background. Se non si è sicuri, è sempre possibile modificare le impostazioni dal menu dell\'applicazione Disroot in un secondo momento.</string>
     <string name="DiasporaTitle">Impostazioni Diaspora*</string>
     <string name="DiasporaInfo">Rete sociale distribuita e decentralizzata. Pubblicare, condividere, tipo, creare comunità.\n\nNome utente:\n il_tuo_nome_utente_diaspora_@pod.disroot.org\n\nPassword:\n la_tua_password_diaspora</string>
     <string name="PadInfo">Con Etherpad scrivere articoli, comunicati stampa, liste di cose da fare, ecc. insieme ad amici, compagni di studio o colleghi, tutti che lavorano sullo stesso documento allo stesso tempo.\nNon è richiesta alcuna registrazione.</string>
@@ -157,4 +157,7 @@
     <string name="action_notes">Note</string>
     <string name="PadDialog">Per continuare è necessario installare Padland.\nSelezionate installa per continuare con l\'installazione su F-Droid.</string>
     <string name="do_you_want_to_exit">Vuoi veramente uscire?</string>
+    <string name="action_optimization">Battery optimization</string>
+    <string name="OptimizationTitle">Battery optimization</string>
+    <string name="OptimizationInfo">Con questo aggiornamento l\'applicazione può sincronizzarsi con la pagina di stato di Disroot. Questo significa che riceverai in tempo reale gli aggiornamenti sui problemi, i tempi di inattività, la manutenzione programmata e altri aggiornamenti pubblicati su https://state.disroot.org\nSi consiglia di disattivare l\'ottimizzazione della batteria e consentire all\'applicazione Disroot di funzionare in background. Se non si è sicuri, è sempre possibile modificare le impostazioni dal menu dell\'applicazione Disroot in un secondo momento.</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3247e86f04bfe09d75b855a4a6b218e5be0ec1fe..b3e55c5fe6e047cb797b8f794fe16835bf167c99 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -79,8 +79,8 @@
     <string name="SpreadTheWordTxt">Vertel je vrienden en familie over Disroot! Waarom blogt je niet over jou ervaringen? We horen graag van je!</string>
     <string name="SpreadTheWordBtn">Deel de app</string>
     <string name="DisrootWeb">Disroot web</string>
-    <string name="FirstTitle">Ik vergat bijna</string>
-    <string name="FirstInfo">Je kan op elk pictogram lang drukken om jou extra informatie te tonen…</string>
+    <string name="FirstTitle">De laatste paar dingen!</string>
+    <string name="FirstInfo">&#8226; Je kan op elk pictogram lang drukken om jou extra informatie te tonen…&#8226; De app kan synchroniseren met de statuspagina van Disroot. Dit betekent dat u realtime updates ontvangt over issues, downtimes, gepland onderhoud en andere zaken die gepubliceerd worden via https://state.disroot.org\nWe raden aan om de batterijoptimalisatie uit te schakelen en de Disroot app op de achtergrond te laten draaien. Als u niet zeker bent, kunt u de instelling later altijd nog wijzigen vanuit het Disroot app menu.</string>
     <string name="DiasporaTitle">Diaspora* Instellingen</string>
     <string name="DiasporaInfo">Gedistribueerd en gedecentraliseerd sociaal netwerk. Plaatsen, delen, liken, gemeenschappen creëren.\n\nGebruikersnaam:\n jou_diaspora_gebruikersnaam@pod.disroot.org\n\nWachtwoord:\n jou_diaspora_wachtwoord</string>
     <string name="PadInfo">Met Etherpad schrijf artikelen, persberichten, to-do lijsten, etc. samen met vrienden, medestudenten of collega\'s, die allemaal op hetzelfde moment aan hetzelfde document werken.\nEr is geen registratie vereist.</string>
@@ -159,4 +159,7 @@
     <string name="action_notes">Notes</string>
     <string name="PadDialog">Om verder te gaan moet u eerst Padland installeren.\nSelecteer Installeren om verder te gaan met de installatie op F-Droid.</string>
     <string name="do_you_want_to_exit">Will je de app verlaten?</string>
+    <string name="action_optimization">Battery optimization</string>
+    <string name="OptimizationTitle">Battery optimization</string>
+    <string name="OptimizationInfo">Met deze update kan de app synchroniseren met de statuspagina van Disroot. Dit betekent dat u realtime updates ontvangt over issues, downtime, gepland onderhoud en andere zaken die gepubliceerd worden via https://state.disroot.org\nWe raden aan om de batterijoptimalisatie uit te schakelen en de Disroot app op de achtergrond te laten draaien. Als u niet zeker bent, kunt u de instelling later altijd nog wijzigen vanuit het Disroot app menu.</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 886962e1cb5771a9b1c4538a3ff9dca6d7caa702..7a9a4fc038cc33d6b66b515f709512a230730711 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -78,8 +78,8 @@
     <string name="SpreadTheWordTxt">Conta aos teus amigos e famelga acerca do Disroot! Porque não escrever um post acerca da tua experiência com o Disroot? Adoraríamos ouvir da tua parte!</string>
     <string name="SpreadTheWordBtn">Partilhar a app</string>
     <string name="DisrootWeb">Disroot web</string>
-    <string name="FirstTitle">Quase que me esquecia</string>
-    <string name="FirstInfo">Podes carregar por alguns segundos em cada ícone para aparecer informação extra…</string>
+    <string name="FirstTitle">Quase que me esquecia</string><!-- need update -->
+    <string name="FirstInfo">Podes carregar por alguns segundos em cada ícone para aparecer informação extra…</string><!-- need update -->
     <string name="DiasporaTitle">Definições do Diaspora*</string>
     <string name="DiasporaInfo">Rede social Distribuída e Descentralizada. Postar, partilhar, criar comunidades.\n\nUsername:\n o_seu_nome_de_utilizador_no_diaspora@pod.disroot.org\n\nPassword:\n a_sua_password_diaspora</string>
     <string name="PadInfo">Com o Etherpad pode escrever artigos, comunicados de imprensa, listas de tarefas, etc. em conjunto com outras pessoas, amigos, colegas, todos a trabalhar no mesmo documento ao mesmo tempo.\nNão é necessário ter uma conta de utilizador para usar.</string>
@@ -157,4 +157,7 @@
     <string name="action_notes">Notes</string>
     <string name="PadDialog">To continue you need to install Padland first.\nPlease select install to continue with the installatin on F-Droid.</string>
     <string name="do_you_want_to_exit">do you want to exit?</string>
+    <string name="action_optimization">Battery optimization</string>
+    <string name="OptimizationTitle">We recommend to turn off battery optimization and allow Disroot app to run in background. If you\'re not sure, you can always change the setting from the menu of the Disroot app later.</string>
+    <string name="OptimizationInfo">With this update the app can sync with the status page of Disroot. This means you will receive realtime updates on issues, downtimes, scheduled maintenace and others published via https://state.disroot.org</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 1a0a8e980bcbf7c9bb24e69269d2dd7ea6ec821d..2c440879d1ede85f4419947fee158cf7b7d4e2ad 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -79,8 +79,8 @@
     <string name="SpreadTheWordTxt">Obavestite prijatelje i porodicu o Disroot platformi! Zašto ne biste napisali blog o vašim iskustvima? Srdačno očekujemo vaše mišljenje!</string>
     <string name="SpreadTheWordBtn">Podelite aplikaciju</string>
     <string name="DisrootWeb">Disroot sajt</string>
-    <string name="FirstTitle">Umalo da zaboravim</string>
-    <string name="FirstInfo">Duži pritisak na bilo koju ikonicu prikazaće dodatne informacije…</string>
+    <string name="FirstTitle">Umalo da zaboravim</string><!-- need update -->
+    <string name="FirstInfo">Duži pritisak na bilo koju ikonicu prikazaće dodatne informacije…</string><!-- need update -->
     <string name="DiasporaTitle">Diaspora* podešavanja</string>
     <string name="DiasporaInfo">Raspodeljena i decentralizovana društvena mreža. Objavite, delite, stvarajte zajednice.\n\nKorisnik:\n vaše_diaspora_korisničko_ime@pod.disroot.org\n\nLozinka:\n vaša_diaspora_lozinka</string>
     <string name="PadInfo">Pomoću Etherpad-a pišite članke, medijske objave, podsetnike, itd. Zajedno sa prijateljima, kolegama sa fakulteta ili saradnicima, možete istovremeno raditi na određenom dokumentu.\nRegistracija nije potrebna.</string>
@@ -158,4 +158,7 @@
     <string name="action_notes">Beleške</string>
     <string name="PadDialog">Za nastavak je potrebno instalirati aplikaciju Padland.\nIzaberite \'instaliraj\' i preuzmite aplikaciju pomoću F-Droid-a.</string>
     <string name="do_you_want_to_exit">do you want to exit?</string>
+    <string name="action_optimization">Battery optimization</string>
+    <string name="OptimizationTitle">We recommend to turn off battery optimization and allow Disroot app to run in background. If you\'re not sure, you can always change the setting from the menu of the Disroot app later.</string>
+    <string name="OptimizationInfo">With this update the app can sync with the status page of Disroot. This means you will receive realtime updates on issues, downtimes, scheduled maintenace and others published via https://state.disroot.org</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6f614bda0407bd18b0216e3de37d8487dbfd4a5e..baa6fbbbeac9947702cdca391b00fa97005195e6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,8 +78,8 @@
     <string name="SpreadTheWordTxt">Tell your friends and family about Disroot! Why don\'t you blog about your experiences? We\'d love to hear from you!</string>
     <string name="SpreadTheWordBtn">Share the app</string>
     <string name="DisrootWeb">Disroot web</string>
-    <string name="FirstTitle">I almost forgot</string>
-    <string name="FirstInfo">You can do a long press on each icon to show you extra information…</string>
+    <string name="FirstTitle">Last couple of things!</string>
+    <string name="FirstInfo">&#8226; By doing a long press on each icon you can get extra information… \n\n&#8226; The app can sync with the status page of Disroot. This means that you will receive realtime updates on issues, downtimes, scheduled maintenace and others published via https://state.disroot.org\nWe recommend to turn off battery optimization and allow Disroot app to run in the background. If you\'re not sure, you can always change the setting from the Disroot app menu later.</string>
     <string name="DiasporaTitle">Diaspora* Settings</string>
     <string name="DiasporaInfo">Distributed and decentralized social network. Post, share, like, create communities.\n\nUsername:\n your_diaspora_username@pod.disroot.org\n\nPassword:\n your_diaspora_password</string>
     <string name="PadInfo">With Etherpad write articles, press releases, to-do lists, etc. together with friends, fellow students or colleagues, all working on the same document at the same time.\nNo registration is required.</string>
@@ -158,4 +158,7 @@
     <string name="action_notes">Notes</string>
     <string name="PadDialog">To continue you need to install Padland first.\nPlease select install to continue with the installation on F-Droid.</string>
     <string name="do_you_want_to_exit">Do you want to exit?</string>
+    <string name="action_optimization">Battery optimization</string>
+    <string name="OptimizationTitle">Battery optimization</string>
+    <string name="OptimizationInfo">With this update the app can sync with the status page of Disroot. This means you will receive realtime updates on issues, downtimes, scheduled maintenace and others published via https://state.disroot.org\nWe recommend to turn off battery optimization and allow Disroot app to run in background. If you\'re not sure, you can always change the setting from the menu of the Disroot app later.</string>
 </resources>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 98a019ba7ea147b0e0ca9687c0f489c5698596f6..e8b4fcd5b4754f350ef83bf3e2bc714a3d61a663 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -2,6 +2,9 @@
 <changelog>
   <release version="1.1.6" versioncode="19" >
       <change>Notifications works as a service now</change>
+      <change>Added shortcut to battery optimizations in menu</change>
+      <change>Prompt for battery optimization to give user choice on first launch</change>
+      <change>Launch status service on boot time when battery optimization is turned off</change>
   </release>
   <release version="1.1.5" versioncode="18" >
       <change>Notifications works on Android 8 and higher now</change>