1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/generator/IqGenerator.java b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
index 5926d48d4..fbb47a2c6 100644
--- a/src/main/java/de/pixart/messenger/generator/IqGenerator.java
+++ b/src/main/java/de/pixart/messenger/generator/IqGenerator.java
@@ -257,10 +257,14 @@ public class IqGenerator extends AbstractGenerator {
         } else if (mam.getWith() != null) {
             data.put("with", mam.getWith().toString());
         }
-        if (mam.getStart() != 0) {
-            data.put("start", getTimestamp(mam.getStart()));
+        final long start = mam.getStart();
+        final long end = mam.getEnd();
+        if (start != 0) {
+            data.put("start", getTimestamp(start));
+        }
+        if (end != 0) {
+            data.put("end", getTimestamp(end));
         }
-        data.put("end", getTimestamp(mam.getEnd()));
         data.submit();
         query.addChild(data);
         Element set = query.addChild("set", "http://jabber.org/protocol/rsm");