diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java
index 35c421a..8fc2f0a 100644
--- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java
+++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java
@@ -97,4 +97,6 @@ public class SCNApp extends Application implements LifecycleObserver
     {
         isBackground = false;
     }
-}
\ No newline at end of file
+}
+
+//TODO TabLayout indicator does not corretly animate when directly clicking on tabs
\ No newline at end of file
diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/AccountFragment.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/AccountFragment.java
index 244c12e..e8aed56 100644
--- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/AccountFragment.java
+++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/AccountFragment.java
@@ -93,7 +93,7 @@ public class AccountFragment extends Fragment
 
             builder.setPositiveButton("YES", (dialog, which) -> {
                 CMessageList.inst().clear();
-                SCNApp.showToast("Notifications cleared", 1000);
+                SCNApp.showToast("Messages cleared", 1000);
                 dialog.dismiss();
             });
 
diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/TabAdapter.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/TabAdapter.java
index 2d07d4e..b6bbeba 100644
--- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/TabAdapter.java
+++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/TabAdapter.java
@@ -35,7 +35,7 @@ public class TabAdapter extends FragmentStatePagerAdapter {
     {
         switch (position)
         {
-            case 0:  return "Notifications";
+            case 0:  return "Messages";
             case 1:  return "Account";
             case 2:  return "Settings";
             default: return null;
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index bc983a0..8a1c359 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -11,13 +11,13 @@
     <string name="ic_img_fuel_desc">Icon Fuel</string>
     <string name="str_qr_code">QR Code</string>
     <string name="str_reset_account">Reset Account</string>
-    <string name="no_notifications">No notifications</string>
+    <string name="no_notifications">No messages</string>
     <string name="str_not_connected">not connected</string>
     <string name="str_reload">reload</string>
     <string name="desc_priority_icon">Priority icon</string>
     <string name="str_common_settings">Common Settings</string>
     <string name="str_enabled">Enabled</string>
-    <string name="str_localcachesize">Remember the last x notifications locally</string>
+    <string name="str_localcachesize">Remember the last x messages locally</string>
     <string name="str_header_prio0">Notifications (priority 0 - Low)</string>
     <string name="str_header_prio1">Notifications (priority 1 - Normal)</string>
     <string name="str_header_prio2">Notifications (priority 2 - High)</string>