1 files changed, 4 insertions, 1 deletions
diff --git a/Swift/Controllers/HistoryController.cpp b/Swift/Controllers/HistoryController.cpp
index deda25b..c03cc2c 100644
--- a/Swift/Controllers/HistoryController.cpp
+++ b/Swift/Controllers/HistoryController.cpp
@@ -7,6 +7,7 @@
 #include <Swift/Controllers/HistoryController.h>
 #include <Swiften/History/SQLiteHistoryManager.h>
 #include <Swiften/History/HistoryMessage.h>
+#include <boost/date_time/c_local_time_adjustor.hpp>
 
 namespace Swift {
 
@@ -20,7 +21,9 @@ HistoryController::~HistoryController() {
 }
 
 void HistoryController::addMessage(const std::string& message, const JID& fromJID, const JID& toJID, HistoryMessage::Type type, const boost::posix_time::ptime& timeStamp) {
-	HistoryMessage historyMessage(message, fromJID, toJID, type, timeStamp);
+	// note: using localtime timestamps
+	HistoryMessage historyMessage(message, fromJID, toJID, type, boost::date_time::c_local_adjustor<boost::posix_time::ptime>::utc_to_local(timeStamp));
+
 	localHistory_->addMessage(historyMessage);
 	onNewMessage(historyMessage);
 }