diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
index 089974b675..c57d9565f0 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
@@ -986,9 +986,6 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
                         } else if let _ = message.peers[message.id.peerId] as? TelegramSecretChat {
                             displayMediaPreviews = false
                         }
-                        if !item.context.sharedContext.immediateExperimentalUISettings.chatListPhotos {
-                            displayMediaPreviews = false
-                        }
                         if displayMediaPreviews {
                             let contentImageFillSize = CGSize(width: 8.0, height: contentImageSize.height)
                             _ = contentImageFillSize
diff --git a/submodules/SettingsUI/Sources/DebugController.swift b/submodules/SettingsUI/Sources/DebugController.swift
index 3351a26003..92e090e841 100644
--- a/submodules/SettingsUI/Sources/DebugController.swift
+++ b/submodules/SettingsUI/Sources/DebugController.swift
@@ -599,7 +599,7 @@ private func debugControllerEntries(presentationData: PresentationData, loggingS
     entries.append(.resetHoles(presentationData.theme))
     entries.append(.reindexUnread(presentationData.theme))
     entries.append(.optimizeDatabase(presentationData.theme))
-    entries.append(.photoPreview(presentationData.theme, experimentalSettings.chatListPhotos))
+    //entries.append(.photoPreview(presentationData.theme, experimentalSettings.chatListPhotos))
     entries.append(.knockoutWallpaper(presentationData.theme, experimentalSettings.knockoutWallpaper))
     entries.append(.alternativeFolderTabs(experimentalSettings.foldersTabAtBottom))
     entries.append(.videoCalls(experimentalSettings.videoCalls))
diff --git a/submodules/TelegramCore/Sources/MultipartUpload.swift b/submodules/TelegramCore/Sources/MultipartUpload.swift
index c4f2b4cb57..ac1246a68b 100644
--- a/submodules/TelegramCore/Sources/MultipartUpload.swift
+++ b/submodules/TelegramCore/Sources/MultipartUpload.swift
@@ -152,11 +152,11 @@ private final class MultipartUploadManager {
         self.progress = progress
         self.completed = completed
         
-        //if headerSize == 0 {
+        if headerSize == 0 {
             self.headerPartState = .ready
-        /*} else {
+        } else {
             self.headerPartState = .notStarted
-        }*/
+        }
         
         if let hintFileSize = hintFileSize, hintFileSize > 10 * 1024 * 1024 {
             self.defaultPartSize = 512 * 1024
diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index 864a245f2d..7976087cbb 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -376,7 +376,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             case .inline:
                 navigationBarPresentationData = nil
             default:
-                navigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: true, hideBadge: false)
+                navigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData, hideBackground: false, hideBadge: false)
         }
         super.init(context: context, navigationBarPresentationData: navigationBarPresentationData, mediaAccessoryPanelVisibility: mediaAccessoryPanelVisibility, locationBroadcastPanelSource: locationBroadcastPanelSource)
         
@@ -2808,7 +2808,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         if self.hasEmbeddedTitleContent {
             navigationBarTheme = NavigationBarTheme(rootControllerTheme: defaultDarkPresentationTheme, hideBackground: true, hideBadge: true)
         } else {
-            navigationBarTheme = NavigationBarTheme(rootControllerTheme: self.presentationData.theme, hideBackground: true, hideBadge: false)
+            navigationBarTheme = NavigationBarTheme(rootControllerTheme: self.presentationData.theme, hideBackground: false, hideBadge: false)
         }
         
         self.navigationBar?.updatePresentationData(NavigationBarPresentationData(theme: navigationBarTheme, strings: NavigationBarStrings(presentationStrings: self.presentationData.strings)))
diff --git a/submodules/TelegramUI/Sources/ChatControllerNode.swift b/submodules/TelegramUI/Sources/ChatControllerNode.swift
index 18d6e9d6f3..9ece44a048 100644
--- a/submodules/TelegramUI/Sources/ChatControllerNode.swift
+++ b/submodules/TelegramUI/Sources/ChatControllerNode.swift
@@ -563,7 +563,9 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.addSubnode(self.navigateButtons)
         
         self.addSubnode(self.navigationBarBackroundNode)
+        self.navigationBarBackroundNode.isHidden = true
         self.addSubnode(self.navigationBarSeparatorNode)
+        self.navigationBarSeparatorNode.isHidden = true
         
         self.historyNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
         
@@ -1449,10 +1451,8 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         transition.updateFrame(node: self.navigateButtons, frame: apparentNavigateButtonsFrame)
         
         if let titleAccessoryPanelNode = self.titleAccessoryPanelNode, let titleAccessoryPanelFrame = titleAccessoryPanelFrame, !titleAccessoryPanelNode.frame.equalTo(titleAccessoryPanelFrame) {
-            if immediatelyLayoutTitleAccessoryPanelNodeAndAnimateAppearance {
-                titleAccessoryPanelNode.frame = titleAccessoryPanelFrame.offsetBy(dx: 0.0, dy: -titleAccessoryPanelFrame.size.height)
-            }
-            transition.updateFrame(node: titleAccessoryPanelNode, frame: titleAccessoryPanelFrame)
+            titleAccessoryPanelNode.frame = titleAccessoryPanelFrame
+            transition.animatePositionAdditive(node: titleAccessoryPanelNode, offset: CGPoint(x: 0.0, y: -titleAccessoryPanelFrame.height))
         }
         
         if let inputPanelNode = self.inputPanelNode, let apparentInputPanelFrame = apparentInputPanelFrame, !inputPanelNode.frame.equalTo(apparentInputPanelFrame) {
@@ -2685,6 +2685,8 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     }
     
     func updateEmbeddedTitlePeekContent(content: NavigationControllerDropContent?) {
+        return;
+        
         guard let (_, navigationHeight) = self.validLayout else {
             return
         }
@@ -2711,6 +2713,8 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     var updateHasEmbeddedTitleContent: (() -> Void)?
     
     func acceptEmbeddedTitlePeekContent(content: NavigationControllerDropContent) -> Bool {
+        return false;
+        
         guard let (_, navigationHeight) = self.validLayout else {
             return false
         }