diff --git a/src/matriximageprovider.h b/src/matriximageprovider.h
index 030ea41ad..70f911e85 100644
--- a/src/matriximageprovider.h
+++ b/src/matriximageprovider.h
@@ -56,7 +56,7 @@ class MatrixImageProvider : public QObject, public QQuickAsyncImageProvider {
 
   Quotient::Connection* connection() { return m_connection; }
   void setConnection(Quotient::Connection* connection) {
-    m_connection.store(connection);
+    m_connection.storeRelaxed(connection);
     emit connectionChanged();
   }
 
diff --git a/src/messageeventmodel.cpp b/src/messageeventmodel.cpp
index b023f44fc..48862e165 100644
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -207,13 +207,13 @@ int MessageEventModel::refreshEventRoles(const QString& id,
 }
 
 inline bool hasValidTimestamp(const Quotient::TimelineItem& ti) {
-  return ti->timestamp().isValid();
+  return ti->originTimestamp().isValid();
 }
 
 QDateTime MessageEventModel::makeMessageTimestamp(
     const Quotient::Room::rev_iter_t& baseIt) const {
   const auto& timeline = m_currentRoom->messageEvents();
-  auto ts = baseIt->event()->timestamp();
+  auto ts = baseIt->event()->originTimestamp();
   if (ts.isValid())
     return ts;
 
@@ -222,10 +222,10 @@ QDateTime MessageEventModel::makeMessageTimestamp(
   using Quotient::TimelineItem;
   auto rit = std::find_if(baseIt, timeline.rend(), hasValidTimestamp);
   if (rit != timeline.rend())
-    return {rit->event()->timestamp().date(), {0, 0}, Qt::LocalTime};
+    return {rit->event()->originTimestamp().date(), {0, 0}, Qt::LocalTime};
   auto it = std::find_if(baseIt.base(), timeline.end(), hasValidTimestamp);
   if (it != timeline.end())
-    return {it->event()->timestamp().date(), {0, 0}, Qt::LocalTime};
+    return {it->event()->originTimestamp().date(), {0, 0}, Qt::LocalTime};
 
   // What kind of room is that?..
   qCritical() << "No valid timestamps in the room timeline!";
@@ -242,7 +242,8 @@ QString MessageEventModel::renderDate(QDateTime timestamp) const {
     return tr("The day before yesterday");
   if (date > QDate::currentDate().addDays(-7))
     return date.toString("dddd");
-  return date.toString(Qt::DefaultLocaleShortDate);
+
+  return QLocale::system().toString(date, QLocale::ShortFormat);
 }
 
 void MessageEventModel::refreshLastUserEvents(int baseTimelineRow) {
diff --git a/src/spectralroom.cpp b/src/spectralroom.cpp
index 5ee909a9e..c279166bc 100644
--- a/src/spectralroom.cpp
+++ b/src/spectralroom.cpp
@@ -167,7 +167,7 @@ void SpectralRoom::countChanged() {
 QDateTime SpectralRoom::lastActiveTime() const {
   if (timelineSize() == 0)
     return QDateTime();
-  return messageEvents().rbegin()->get()->timestamp();
+  return messageEvents().rbegin()->get()->originTimestamp();
 }
 
 int SpectralRoom::savedTopVisibleIndex() const {