diff --git a/.gitmodules b/.gitmodules
index 4f154110..47440300 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "vendor/react-native-actionsheet"]
 	path = vendor/react-native-actionsheet
 	url = git@github.com:mobitar/react-native-actionsheet.git
+[submodule "vendor/react-native-aes"]
+	path = vendor/react-native-aes
+	url = git@github.com:mobitar/react-native-aes.git
+[submodule "vendor/react-native-mail"]
+	path = vendor/react-native-mail
+	url = git@github.com:mobitar/react-native-mail.git
diff --git a/android/build.gradle b/android/build.gradle
index ead33838..240a3940 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'de.undercouch:gradle-download-task:3.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/vendor/react-native-aes b/vendor/react-native-aes
index 69684e32..9c581805 160000
--- a/vendor/react-native-aes
+++ b/vendor/react-native-aes
@@ -1 +1 @@
-Subproject commit 69684e3283b13327b493b6bc8fffe45b13c6d56c
+Subproject commit 9c581805d4bf3cdef0b173b789666b4f55773b5a
diff --git a/vendor/react-native-mail b/vendor/react-native-mail
index 1dd9bc83..a98b6a25 160000
--- a/vendor/react-native-mail
+++ b/vendor/react-native-mail
@@ -1 +1 @@
-Subproject commit 1dd9bc83a142c5bd37040d0c57389eace9fe35d8
+Subproject commit a98b6a25f39ffcab8d97bb8815bb23c511d4e5a8