diff --git a/TCHAP_CHANGES.rst b/TCHAP_CHANGES.rst
index 73c062d33a..274d5404d0 100644
--- a/TCHAP_CHANGES.rst
+++ b/TCHAP_CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in Tchap 1.2.1 (2021-04-12)
+===================================================
+
+Bug Fixes:
+ * Crash when the user selects "forward" on a selected message
+ * Favorite messages are not readable in dark mode
+ * Share extension: the rooms list are not readable in dark mode
+
 Changes in Tchap 1.2.0 (2021-03-24)
 ===================================================
 
diff --git a/Tchap.xcodeproj/project.pbxproj b/Tchap.xcodeproj/project.pbxproj
index 27d2393d9f..231c03bad6 100644
--- a/Tchap.xcodeproj/project.pbxproj
+++ b/Tchap.xcodeproj/project.pbxproj
@@ -9874,7 +9874,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -9926,7 +9926,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.2.0;
+				MARKETING_VERSION = 1.2.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
diff --git a/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift b/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
index 34a92051bf..3b4cea79fc 100644
--- a/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
+++ b/Tchap/Modules/Favourites/FavouriteMessages/FavouriteMessagesViewController.swift
@@ -117,6 +117,7 @@ final class FavouriteMessagesViewController: UIViewController {
     private func update(style: Style) {
         self.currentStyle = style
         
+        self.tableView.backgroundColor = style.backgroundColor;
         self.view.backgroundColor = style.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
diff --git a/Tchap/Modules/Forward/ForwardDataSource.swift b/Tchap/Modules/Forward/ForwardDataSource.swift
index f596f9228f..ffa19006f8 100644
--- a/Tchap/Modules/Forward/ForwardDataSource.swift
+++ b/Tchap/Modules/Forward/ForwardDataSource.swift
@@ -36,7 +36,7 @@ class ForwardDataSource: MXKRecentsDataSource {
                     continue
                 }
                 
-                if let recentCellData = MXKRecentCellData(roomSummary: summary, andRecentListDataSource: nil) {
+                if let recentCellData = MXKRecentCellData(roomSummary: summary, andRecentListDataSource: nil), recentCellData.roomDisplayname != nil {
                     self.cellDataArray.append(recentCellData)
                 }
             }
diff --git a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
index f386085214..55e8b737f2 100644
--- a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
+++ b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsDiscussionCell.swift
@@ -39,6 +39,8 @@ import UIKit
     override func update(style: Style) {
         super.update(style: style)
         self.domainLabel.textColor = style.primarySubTextColor
+        
+        self.contentView.backgroundColor = style.backgroundColor
     }
     
     func renderedCellData() -> MXKCellData! {
diff --git a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
index c3c5e219d9..81f059c3aa 100644
--- a/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
+++ b/TchapShareExtension/Modules/Share/Listing/Views/ShareRoomsRoomCell.swift
@@ -41,6 +41,8 @@ class ShareRoomsRoomCell: RoomsCell {
     
     override func update(style: Style) {
         super.update(style: style)
+        
+        self.contentView.backgroundColor = style.backgroundColor
     }
     
     private func updateAvatarView () {