diff --git a/src/app/mainview/components/MessageListView.qml b/src/app/mainview/components/MessageListView.qml
index aa1d0fa3809e2db15e3c9ee3e4401e763bb8f7e3..98a691979418d188e3bd271b056693e4d1633670 100644
--- a/src/app/mainview/components/MessageListView.qml
+++ b/src/app/mainview/components/MessageListView.qml
@@ -1,7 +1,5 @@
 /*
  * Copyright (C) 2021-2023 Savoir-faire Linux Inc.
- * Author: Trevor Tabah <trevor.tabah@savoirfairelinux.com>
- * Author: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -169,6 +167,11 @@ JamiListView {
     topMargin: 12
     spacing: 2
 
+    // The offscreen buffer is set to a reasonable value to avoid flickering
+    // when scrolling up and down in a list with items of different heights.
+    displayMarginBeginning: 2048
+    displayMarginEnd: 2048
+
     maximumFlickVelocity: 2048
     verticalLayoutDirection: ListView.BottomToTop
     boundsBehavior: Flickable.StopAtBounds