diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7aef609b..3727217d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,11 +113,11 @@ flutter {
 }
 
 dependencies {
-    implementation 'com.google.crypto.tink:apps-webpush:1.3.0-rc1'
-    implementation 'com.google.firebase:firebase-core:17.2.1'
+    implementation 'com.google.crypto.tink:apps-webpush:1.3.0'
+    implementation 'com.google.firebase:firebase-messaging:20.1.6'
     implementation 'org.bouncycastle:bcprov-jdk16:1.46'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
 
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 674c37b7..4f93f086 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -16,15 +16,16 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
+        android:name=".MainApplication" <!-- TODO this entry is a temporary hack to be able to try stuff with the FirebaseMessagingPlugin - See https://github.com/FirebaseExtended/flutterfire/issues/1754 for more information -->
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         tools:replace="android:label">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
             <!-- Specify that the launch screen should continue being displayed until Flutter renders its first frame. -->
             <meta-data
diff --git a/android/app/src/main/java/com/openxchange/oxcoi/MainApplication.java b/android/app/src/main/java/com/openxchange/oxcoi/MainApplication.java
new file mode 100644
index 00000000..2f2f77f7
--- /dev/null
+++ b/android/app/src/main/java/com/openxchange/oxcoi/MainApplication.java
@@ -0,0 +1,22 @@
+package com.openxchange.oxcoi;
+
+
+import io.flutter.app.FlutterApplication;
+import io.flutter.plugin.common.PluginRegistry;
+import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
+import io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin;
+import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService;
+
+// TODO this whole class is a temporary hack to be able to try stuff with the FirebaseMessagingPlugin - See https://github.com/FirebaseExtended/flutterfire/issues/1754 for more information
+public class MainApplication extends FlutterApplication implements PluginRegistrantCallback {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        FlutterFirebaseMessagingService.setPluginRegistrant(this);
+    }
+
+    @Override
+    public void registerWith(PluginRegistry registry) {
+        FirebaseMessagingPlugin.registerWith(registry.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/main/java/com/openxchange/oxcoi/MethodChannels.java b/android/app/src/main/java/com/openxchange/oxcoi/MethodChannels.java
index 26a52bf0..c8d8b665 100644
--- a/android/app/src/main/java/com/openxchange/oxcoi/MethodChannels.java
+++ b/android/app/src/main/java/com/openxchange/oxcoi/MethodChannels.java
@@ -7,7 +7,7 @@ abstract static class Security {
         static final String NAME = "oxcoi.security";
 
         abstract static class Methods {
-            static final String DECRYPT = "'decrypt'";
+            static final String DECRYPT = "decrypt";
         }
 
         abstract static class Arguments {
diff --git a/android/build.gradle b/android/build.gradle
index 9234dae2..b964b7fd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.google.gms:google-services:4.3.3'
     }
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 55fb03a1..b30f0213 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 28 13:37:47 CET 2019
+#Wed Apr 29 13:11:03 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/lib/src/push/push_manager.dart b/lib/src/push/push_manager.dart
index f34cfb9a..30c927cc 100644
--- a/lib/src/push/push_manager.dart
+++ b/lib/src/push/push_manager.dart
@@ -57,10 +57,17 @@ import 'package:ox_coi/src/push/push_bloc.dart';
 import 'package:ox_coi/src/push/push_event_state.dart';
 import 'package:ox_coi/src/security/security_manager.dart';
 
+final _logger = Logger("push_manager");
+
+Future<void> onBackgroundMessage(Map<String, dynamic> message) {
+  //TODO: Add functionality
+  _logger.info("onBackgroundMessage $message");
+  return Future(null);
+}
+
 class PushManager {
   final _firebaseMessaging = FirebaseMessaging();
   final _notificationManager = DisplayNotificationManager();
-  final _logger = Logger("push_manager");
 
   BuildContext _buildContext;
   PushBloc _pushBloc;
@@ -83,11 +90,13 @@ class PushManager {
           final decryptedContent = await decryptAsync(notificationData.content);
           if (_isValidationPush(decryptedContent)) {
             final validation = _getPushValidation(decryptedContent).validation;
+            _logger.info("Validation message with state validation: $validation received");
             _pushBloc.add(ValidateMetadata(validation: validation));
           } else {
             final pushChatMessage = _getPushChatMessage(decryptedContent);
             final fromEmail = pushChatMessage.fromEmail;
             final body = "I sent you a new chat message"; // TODO replace decrypt
+            _logger.info("Chat message received from: $fromEmail");
             await _notificationManager.showNotificationFromPushAsync(fromEmail, body);
           }
         }
@@ -103,6 +112,7 @@ class PushManager {
         _logger.info("onLaunch $message");
         return Future(null);
       },
+      onBackgroundMessage: onBackgroundMessage,
     );
     _firebaseMessaging.requestNotificationPermissions(const IosNotificationSettings(sound: true, badge: true, alert: true));
   }