diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6804a0f..7eff2fad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 1.18.5
+* colorize send button only after history is caught up
+* improved MAM catchup strategy
+
 ### Version 1.18.4
 * fixed UI freezes during connection timeout
 * fixed notification sound playing twice
diff --git a/build.gradle b/build.gradle
index 7314e977..818cf6b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ configurations {
 
 dependencies {
     compile project(':libs:MemorizingTrustManager')
-    playstoreCompile 'com.google.android.gms:play-services-gcm:10.2.1'
+    playstoreCompile 'com.google.android.gms:play-services-gcm:10.2.6'
     compile 'org.sufficientlysecure:openpgp-api:10.0'
     compile 'com.soundcloud.android:android-crop:1.0.1@aar'
     compile 'com.android.support:support-v13:25.3.1'
@@ -51,13 +51,13 @@ ext {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 214
-        versionName "1.18.4"
+        versionCode 217
+        versionName "1.18.5"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }