diff --git a/.gitignore b/.gitignore
index 0f47acf088..fbcf6ea06e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,18 +4,7 @@ local.properties
 keystore.properties
 crowdin.properties
 .gradle
-.idea/caches
-.idea/dictionaries
-.idea/libraries
-.idea/crowdin_settings.xml
-.idea/encodings.xml
-.idea/assetWizardSettings.xml
-.idea/gradle.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/tasks.xml
-.idea/vcs.xml
-.idea/workspace.xml
+.idea/*
 app/.cxx/
 build
 captures
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index aaec3598bb..7d8d3ba8b7 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 # https://developer.android.com/studio/projects/configure-cmake
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.10.2)
 
 add_library(fairemail SHARED
         src/main/jni/fairemail.cc
diff --git a/app/build.gradle b/app/build.gradle
index 24e055382a..8b80e13d4e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
         // https://developer.android.com/guide/topics/graphics/vector-drawable-resources
         vectorDrawables.useSupportLibrary = true
 
-        //ndkVersion "21.0.6113669"
+        //ndkVersion "22.0.7026061"
         ndk {
             // Bugsnag, sqlite
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
@@ -249,7 +249,6 @@ dependencies {
     def swiperefresh_version = "1.2.0-alpha01"
     def documentfile_version = "1.0.1"
     def lifecycle_version = "2.3.0-rc01"
-    def lifecycle_extensions_version = "2.2.0"
     def sqlite_version = "2.1.0"
     def room_version = "2.2.6" // 2.3.0-alpha04
     def paging_version = "2.1.2" // 3.0.0-alpha11
@@ -330,11 +329,9 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-core:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"
     annotationProcessor "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
 
-    // https://mvnrepository.com/artifact/androidx.lifecycle/lifecycle-extensions
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_extensions_version"
-
     // https://mvnrepository.com/artifact/androidx.room/room-runtime
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-common:$room_version" // because of exclude