diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h
index bba40669..1ed84aaf 100644
--- a/include/timeline/TimelineView.h
+++ b/include/timeline/TimelineView.h
@@ -88,8 +88,8 @@ public:
 
         template<class Widget, mtx::events::MessageType MsgType>
         void addUserMessage(const QString &url,
-                            const QSharedPointer<QIODevice> data,
-                            const QString &filename);
+                            const QString &filename,
+                            const QSharedPointer<QIODevice> data = Q_NULLPTR);
         void updatePendingMessage(int txn_id, QString event_id);
         void scrollDown();
         void addDateSeparator(QDateTime datetime, int position);
@@ -219,8 +219,8 @@ private:
 template<class Widget, mtx::events::MessageType MsgType>
 void
 TimelineView::addUserMessage(const QString &url,
-                             const QSharedPointer<QIODevice> data,
-                             const QString &filename)
+                             const QString &filename,
+                             const QSharedPointer<QIODevice> data)
 {
         auto with_sender = lastSender_ != local_user_;
 
diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc
index 65c9ac83..42145819 100644
--- a/src/timeline/TimelineViewManager.cc
+++ b/src/timeline/TimelineViewManager.cc
@@ -96,7 +96,7 @@ TimelineViewManager::queueImageMessage(const QString &roomid,
 
         auto view = views_[roomid];
 
-        view->addUserMessage<ImageItem, mtx::events::MessageType::Image>(url, data, filename);
+        view->addUserMessage<ImageItem, mtx::events::MessageType::Image>(url, filename, data);
 }
 
 void
@@ -111,7 +111,7 @@ TimelineViewManager::queueFileMessage(const QString &roomid,
 
         auto view = views_[roomid];
 
-        view->addUserMessage<FileItem, mtx::events::MessageType::File>(url, nullptr, filename);
+        view->addUserMessage<FileItem, mtx::events::MessageType::File>(url, filename);
 }
 
 void
@@ -126,7 +126,7 @@ TimelineViewManager::queueAudioMessage(const QString &roomid,
 
         auto view = views_[roomid];
 
-        view->addUserMessage<AudioItem, mtx::events::MessageType::Audio>(url, nullptr, filename);
+        view->addUserMessage<AudioItem, mtx::events::MessageType::Audio>(url, filename);
 }
 
 void