1 files changed, 9 insertions, 4 deletions
diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp
index 3f021e9..23bc099 100644
--- a/Swift/QtUI/QtWebKitChatView.cpp
+++ b/Swift/QtUI/QtWebKitChatView.cpp
@@ -208,31 +208,36 @@ void QtWebKitChatView::addLastSeenLine() {
 		newInsertPoint_.prependOutside(lineSeparator_);
 	}
 	else {
 		QWebElement lineSeparatorC = lineSeparator_.clone();
 		lineSeparatorC.removeFromDocument();
 	}
 	newInsertPoint_.prependOutside(lineSeparator_);
 }
 
-void QtWebKitChatView::replaceLastMessage(const QString& newMessage) {
+void QtWebKitChatView::replaceLastMessage(const QString& newMessage, const ChatWindow::TimestampBehaviour timestampBehaviour) {
 	assert(viewReady_);
 	rememberScrolledToBottom();
 	assert(!lastElement_.isNull());
 	QWebElement replace = lastElement_.findFirst("span.swift_message");
 	assert(!replace.isNull());
 	QString old = lastElement_.toOuterXml();
 	replace.setInnerXml(ChatSnippet::escape(newMessage));
+	if (timestampBehaviour == ChatWindow::UpdateTimestamp) {
+		replace = lastElement_.findFirst("span.swift_time");
+		assert(!replace.isNull());
+		replace.setInnerXml(ChatSnippet::timeToEscapedString(QDateTime::currentDateTime()));
+	}
 }
 
 void QtWebKitChatView::replaceLastMessage(const QString& newMessage, const QString& note) {
 	rememberScrolledToBottom();
-	replaceLastMessage(newMessage);
+	replaceLastMessage(newMessage, ChatWindow::KeepTimestamp);
 	QWebElement replace = lastElement_.findFirst("span.swift_time");
 	assert(!replace.isNull());
 	replace.setInnerXml(ChatSnippet::escape(note));
 }
 
 QString QtWebKitChatView::getLastSentMessage() {
 	return lastElement_.toPlainText();
 }
 
@@ -834,20 +839,20 @@ void QtWebKitChatView::addPresenceMessage(const ChatWindow::ChatMessage& message
 		window_->onAllMessagesRead();
 	}
 
 	QString messageHTML = chatMessageToHTML(message);
 	addMessageBottom(boost::make_shared<SystemMessageSnippet>(messageHTML, QDateTime::currentDateTime(), false, theme_, getActualDirection(message, direction)));
 
 	previousMessageKind_ = PreviousMessageWasPresence;
 }
 
-void QtWebKitChatView::replaceLastMessage(const ChatWindow::ChatMessage& message) {
-	replaceLastMessage(chatMessageToHTML(message));
+void QtWebKitChatView::replaceLastMessage(const ChatWindow::ChatMessage& message, const ChatWindow::TimestampBehaviour timestampBehaviour) {
+	replaceLastMessage(chatMessageToHTML(message), timestampBehaviour);
 }
 
 void QtWebKitChatView::addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct, bool isImpromptu, bool isContinuation) {
 	if (window_->isWidgetSelected()) {
 		window_->onAllMessagesRead();
 	}
 
 	QString message;
 	if (isImpromptu) {