diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index aef88ad2801dc5d239a5b4f061c08752bf35f87b..fc12c43ae429822cb60f118112d6979b7e5049d3 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2269,6 +2269,12 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                     formType != null && formType.equals("form")) {
 
                     responseElement.setAttribute("type", "submit");
+                    Element rsm = responseElement.findChild("set", "http://jabber.org/protocol/rsm");
+                    if (rsm != null) {
+                        Element max = new Element("max", "http://jabber.org/protocol/rsm");
+                        max.setContent("1000");
+                        rsm.addChild(max);
+                    }
                     c.addChild(responseElement);
                 }