From ff0c114cd66b0fcae6fe8d6598fde48d9c1c5bd4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 28 Jul 2015 12:54:54 +0200
Subject: [PATCH] set time on resend to current time fixes #1298 fixes #919

---
 .../eu/siacs/conversations/services/XmppConnectionService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index fa0a87096..cadcf8512 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2533,8 +2533,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			}
 		}
 		for (final Message msg : messages) {
+			msg.setTime(System.currentTimeMillis());
 			markMessage(msg, Message.STATUS_WAITING);
-			this.resendMessage(msg,true);
+			this.resendMessage(msg,false);
 		}
 	}