diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java
index 5e90e312..4f7a3390 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java
@@ -38,7 +38,7 @@ public class CustomWebViewClient extends WebViewClient {
     public void onPageStarted(WebView view, String url, Bitmap favicon) {
         super.onPageStarted(view, url, favicon);
         swipeRefreshLayout.setEnabled(true);
-        if(url.endsWith("/conversations/new")){
+        if(url.contains(app.getSettings().getPodDomain()+"/conversations/") || url.endsWith("status_messages/new")){
             swipeRefreshLayout.setEnabled(false);
         }
     }
diff --git a/build.gradle b/build.gradle
index 327cdcb3..34414aca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
 
         // NOTE: Do not place your application dependencies here; they belong