diff --git a/app/build.gradle b/app/build.gradle
index c2e001ae1..99b41c603 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ android {
 }
 
 ext {
-    supportLibraryVersion = '27.1.0'
+    supportLibraryVersion = '27.1.1'
 }
 
 
@@ -83,7 +83,7 @@ dependencies {
     implementation 'com.android.support:multidex:1.0.3'
 
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation "io.reactivex.rxjava2:rxjava:2.1.4"
+    implementation "io.reactivex.rxjava2:rxjava:2.1.7"
 
     implementation 'com.bluelinelabs:conductor:2.1.4'
     implementation 'com.bluelinelabs:conductor-support:2.1.4'
@@ -99,17 +99,19 @@ dependencies {
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     implementation 'com.github.aurae.retrofit2:converter-logansquare:1.4.1'
 
-    implementation 'com.google.dagger:dagger:2.8'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.8'
+    implementation 'com.google.dagger:dagger:2.9'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.9'
     implementation 'com.github.lukaspili.autodagger2:autodagger2:1.1'
     annotationProcessor 'com.github.lukaspili.autodagger2:autodagger2-compiler:1.1'
 
+    compileOnly 'javax.annotation:jsr250-api:1.0' // Android only
+
     implementation 'org.greenrobot:eventbus:3.0.0'
 
-    implementation 'io.requery:requery:1.5.0'
-    implementation 'io.requery:requery-android:1.5.0'
+    implementation 'io.requery:requery:1.5.1'
+    implementation 'io.requery:requery-android:1.5.1'
     implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
-    annotationProcessor 'io.requery:requery-processor:1.5.0'
+    annotationProcessor 'io.requery:requery-processor:1.5.1'
 
     implementation 'org.parceler:parceler-api:1.1.9'
     annotationProcessor 'org.parceler:parceler:1.1.9'
@@ -125,8 +127,6 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 
-    debugImplementation "javax.transaction:transaction-api:1.1-rev-1"
-
     implementation 'com.github.HITGIF:TextFieldBoxes:1.4.3'
 
     implementation 'eu.davidea:flexible-adapter:5.0.3'
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index 5eb5ec866..02a0ad877 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -110,25 +110,18 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     public static final String TAG = "ContactsController";
 
     private static final String KEY_SEARCH_QUERY = "ContactsController.searchQuery";
-
-    @Inject
-    UserUtils userUtils;
-
-    @Inject
-    NcApi ncApi;
-
-    @Inject
-    EventBus eventBus;
-
     @BindView(R.id.call_header_layout)
     public RelativeLayout callHeaderLayout;
-
     @BindView(R.id.initial_relative_layout)
     public RelativeLayout initialRelativeLayout;
-
     @BindView(R.id.secondary_relative_layout)
     public RelativeLayout secondaryRelativeLayout;
-
+    @Inject
+    UserUtils userUtils;
+    @Inject
+    NcApi ncApi;
+    @Inject
+    EventBus eventBus;
     @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
 
@@ -759,7 +752,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     }
 
     @OnClick(R.id.call_header_layout)
-    private void toggleCallHeader() {
+    void toggleCallHeader() {
         adapter.toggleSelection(0);
         isPublicCall = adapter.isSelected(0);
         if (!isPublicCall) {
diff --git a/app/src/main/res/layout/controller_contacts_rv.xml b/app/src/main/res/layout/controller_contacts_rv.xml
index 2d8645a24..2e388d84a 100644
--- a/app/src/main/res/layout/controller_contacts_rv.xml
+++ b/app/src/main/res/layout/controller_contacts_rv.xml
@@ -26,4 +26,4 @@
     <include layout="@layout/rv_item_call_header"/>
 
     <include layout="@layout/controller_generic_rv" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/build.gradle b/build.gradle
index 41f308382..d071e2c3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 508be2a2f..dcd7ac057 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 19 12:04:53 CEST 2017
+#Thu Apr 26 16:49:12 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/lombok.config b/lombok.config
new file mode 100644
index 000000000..264dc6580
--- /dev/null
+++ b/lombok.config
@@ -0,0 +1 @@
+lombok.addGeneratedAnnotation = false