diff --git a/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewController.swift b/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewController.swift
index bd3e27f40..2039320e3 100644
--- a/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewController.swift
+++ b/Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewController.swift
@@ -228,11 +228,12 @@ final class EnterNewRoomDetailsViewController: UIViewController {
                                        footer: VectorL10n.createRoomShowInDirectoryFooter)
                 
                 let row_6_0 = Row(type: .textField(tag: Constants.roomAddressTextFieldTag, placeholder: VectorL10n.createRoomPlaceholderAddress, delegate: self), text: viewModel.roomCreationParameters.address, accessoryType: .none) {
-                    
-                    tmpSections.append(contentsOf: [section5])
                 }
-            } else {
-                self.viewModel.roomCreationParameters.showInDirectory = viewModel.roomCreationParameters.isPublic ? true : false
+                let section6 = Section(header: VectorL10n.createRoomSectionHeaderAddress,
+                                       rows: [row_6_0],
+                                       footer: nil)
+                
+                tmpSections.append(contentsOf: [section5, section6])
             }
         }
         
diff --git a/bwi/ContentScanner/UI/ContentScannerBaseCell.swift b/bwi/ContentScanner/UI/ContentScannerBaseCell.swift
index da6358a38..52782a6c4 100644
--- a/bwi/ContentScanner/UI/ContentScannerBaseCell.swift
+++ b/bwi/ContentScanner/UI/ContentScannerBaseCell.swift
@@ -20,7 +20,7 @@ import Foundation
 import UIKit
 
 @objcMembers
-class ContentScannerBaseCell: SizableBaseBubbleCell, BubbleCellReadReceiptsDisplayable, BubbleCellReactionsDisplayable {
+class ContentScannerBaseCell: SizableBaseRoomCell, RoomCellReadReceiptsDisplayable, RoomCellReactionsDisplayable {
         
     var innerContent: ContentScannerContentDelegate?
     var scanStatusViewData: ContentScannerStatusViewData?
@@ -61,8 +61,8 @@ class ContentScannerBaseCell: SizableBaseBubbleCell, BubbleCellReadReceiptsDispl
         guard let roomBubbleCellData = cellData as? RoomBubbleCellData else {
             return
         }
-        self.bubbleCellContentView?.showEncryptionStatus = roomBubbleCellData.containsBubbleComponentWithEncryptionBadge
-        self.bubbleCellContentView?.showSenderInfo = !roomBubbleCellData.shouldHideSenderInformation
-        self.bubbleCellContentView?.showPaginationTitle = roomBubbleCellData.isPaginationFirstBubble
+        self.roomCellContentView?.showEncryptionStatus = roomBubbleCellData.containsBubbleComponentWithEncryptionBadge
+        self.roomCellContentView?.showSenderInfo = !roomBubbleCellData.shouldHideSenderInformation
+        self.roomCellContentView?.showPaginationTitle = roomBubbleCellData.isPaginationFirstBubble
     }
 }