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
@@ -215,5 +215,5 @@ void QtWebKitChatView::addLastSeenLine() {
 }
 
-void QtWebKitChatView::replaceLastMessage(const QString& newMessage) {
+void QtWebKitChatView::replaceLastMessage(const QString& newMessage, const ChatWindow::TimestampBehaviour timestampBehaviour) {
 	assert(viewReady_);
 	rememberScrolledToBottom();
@@ -223,9 +223,14 @@ void QtWebKitChatView::replaceLastMessage(const QString& newMessage) {
 	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());
@@ -841,6 +846,6 @@ void QtWebKitChatView::addPresenceMessage(const ChatWindow::ChatMessage& message
 }
 
-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);
 }