diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart
index f73f213f..d119e5e7 100644
--- a/lib/components/list_items/message.dart
+++ b/lib/components/list_items/message.dart
@@ -99,8 +99,7 @@ class Message extends StatelessWidget {
                 ),
                 if (event.isReply)
                   FutureBuilder<Event>(
-                    future: timeline.getEventById(event.content['m.relates_to']
-                        ['m.in_reply_to']['event_id']),
+                    future: event.getReplyEvent(timeline),
                     builder: (BuildContext context, snapshot) {
                       final Event replyEvent = snapshot.hasData
                           ? snapshot.data
diff --git a/pubspec.lock b/pubspec.lock
index 8bdc0767..44370eea 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -124,8 +124,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: b7dea7c6a5634f68816be9323ce78669b7d0ff0f
-      resolved-ref: b7dea7c6a5634f68816be9323ce78669b7d0ff0f
+      ref: d6e59370668c697a97fefea32c0cdedfb235203b
+      resolved-ref: d6e59370668c697a97fefea32c0cdedfb235203b
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index 9f328397..4812f9bf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,7 +27,7 @@ dependencies:
   famedlysdk:
     git:
       url: https://gitlab.com/famedly/famedlysdk.git
-      ref: 75c1dc1c566e848adebee08e7c882b267ff0797e
+      ref: d6e59370668c697a97fefea32c0cdedfb235203b
 
   localstorage: ^3.0.1+4
   bubble: ^1.1.9+1