diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index f1cb2f130..7180336b5 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -566,7 +566,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
                 .subscribe(new Observer<GenericOverall>() {
                     @Override
                     public void onSubscribe(Disposable d) {
-
+                        disposableList.add(d);
                     }
 
                     @Override
@@ -576,12 +576,11 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
                     @Override
                     public void onError(Throwable e) {
-
                     }
 
                     @Override
                     public void onComplete() {
-
+                        dispose();
                     }
                 });
     }
diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml
index ebbd733d7..cc97750b7 100644
--- a/app/src/main/res/layout/controller_chat.xml
+++ b/app/src/main/res/layout/controller_chat.xml
@@ -68,7 +68,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/messageInputView"
-        android:paddingBottom="16dp"
         android:visibility="gone"
         app:dateHeaderTextSize="13sp"
         app:incomingBubblePaddingBottom="@dimen/message_bubble_corners_padding"