diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorValues.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorValues.swift
index f8ede769d1..3fc98c3399 100644
--- a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorValues.swift
+++ b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorValues.swift
@@ -919,13 +919,14 @@ extension CodableToolValue: Codable {
 public func recommendedVideoExportConfiguration(values: MediaEditorValues) -> MediaEditorVideoExport.Configuration {
     let compressionProperties: [String: Any] = [
         AVVideoAverageBitRateKey: 2000000,
-        AVVideoProfileLevelKey: kVTProfileLevel_HEVC_Main_AutoLevel
-        //AVVideoProfileLevelKey: AVVideoProfileLevelH264HighAutoLevel,
-        //AVVideoH264EntropyModeKey: AVVideoH264EntropyModeCABAC
+        //AVVideoProfileLevelKey: kVTProfileLevel_HEVC_Main_AutoLevel
+        AVVideoProfileLevelKey: AVVideoProfileLevelH264HighAutoLevel,
+        AVVideoH264EntropyModeKey: AVVideoH264EntropyModeCABAC
     ]
     
     let videoSettings: [String: Any] = [
-        AVVideoCodecKey: AVVideoCodecType.hevc,
+        AVVideoCodecKey: AVVideoCodecType.h264,
+        //AVVideoCodecKey: AVVideoCodecType.hevc,
         AVVideoCompressionPropertiesKey: compressionProperties,
         AVVideoWidthKey: 720,
         AVVideoHeightKey: 1280
diff --git a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift
index c038388ebc..1966a36b52 100644
--- a/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift
+++ b/submodules/TelegramUI/Components/MediaEditor/Sources/MediaEditorVideoExport.swift
@@ -14,7 +14,7 @@ enum ExportWriterStatus {
 
 protocol MediaEditorVideoExportWriter {
     func setup(configuration: MediaEditorVideoExport.Configuration, outputPath: String)
-    func setupVideoInput(configuration: MediaEditorVideoExport.Configuration, inputTransform: CGAffineTransform?)
+    func setupVideoInput(configuration: MediaEditorVideoExport.Configuration)
     func setupAudioInput(configuration: MediaEditorVideoExport.Configuration)
     
     func startWriting() -> Bool
@@ -55,28 +55,17 @@ public final class MediaEditorVideoAVAssetWriter: MediaEditorVideoExportWriter {
         writer.shouldOptimizeForNetworkUse = configuration.shouldOptimizeForNetworkUse
     }
     
-    func setupVideoInput(configuration: MediaEditorVideoExport.Configuration, inputTransform: CGAffineTransform?) {
+    func setupVideoInput(configuration: MediaEditorVideoExport.Configuration) {
         guard let writer = self.writer else {
             return
         }
-        let videoInput: AVAssetWriterInput
-        if let transform = inputTransform {
-            let size = CGSize(width: configuration.videoSettings[AVVideoWidthKey] as! Int, height: configuration.videoSettings[AVVideoHeightKey] as! Int)
-            let transformedSize = size.applying(transform.inverted())
-            var videoSettings = configuration.videoSettings
-            videoSettings[AVVideoWidthKey] = abs(transformedSize.width)
-            videoSettings[AVVideoHeightKey] = abs(transformedSize.height)
-            videoInput = AVAssetWriterInput(mediaType: .video, outputSettings: videoSettings)
-            videoInput.transform = transform
-        } else {
-            videoInput = AVAssetWriterInput(mediaType: .video, outputSettings: configuration.videoSettings)
-        }
+        let videoInput = AVAssetWriterInput(mediaType: .video, outputSettings: configuration.videoSettings)
         videoInput.expectsMediaDataInRealTime = false
         
         let sourcePixelBufferAttributes = [
             kCVPixelBufferPixelFormatTypeKey as String: kCVPixelFormatType_32BGRA,
-            kCVPixelBufferWidthKey as String: 1080,
-            kCVPixelBufferHeightKey as String: 1920
+            kCVPixelBufferWidthKey as String: UInt32(configuration.dimensions.width),
+            kCVPixelBufferHeightKey as String: UInt32(configuration.dimensions.height)
         ]
         self.adaptor = AVAssetWriterInputPixelBufferAdaptor(assetWriterInput: videoInput, sourcePixelBufferAttributes: sourcePixelBufferAttributes)
         
@@ -284,11 +273,7 @@ public final class MediaEditorVideoExport {
         } else {
             self.duration.set(CMTime(seconds: 3, preferredTimescale: 1))
         }
-        
-        if self.configuration.values.requiresComposing {
-            self.composer = MediaEditorComposer(account: self.account, values: self.configuration.values, dimensions: self.configuration.dimensions)
-        }
-        
+                
         switch self.subject {
         case let .video(asset):
             self.setupWithAsset(asset)
@@ -297,6 +282,13 @@ public final class MediaEditorVideoExport {
         }
     }
         
+    private func setupComposer() {
+        guard self.composer == nil else {
+            return
+        }
+        self.composer = MediaEditorComposer(account: self.account, values: self.configuration.values, dimensions: self.configuration.dimensions)
+    }
+    
     private func setupWithAsset(_ asset: AVAsset) {
         self.reader = try? AVAssetReader(asset: asset)
         guard let reader = self.reader else {
@@ -315,16 +307,14 @@ public final class MediaEditorVideoExport {
                 
         let videoTracks = asset.tracks(withMediaType: .video)
         if (videoTracks.count > 0) {
-            let videoOutput: AVAssetReaderOutput
-            let inputTransform: CGAffineTransform?
-            if self.composer == nil {
-                videoOutput = AVAssetReaderTrackOutput(track: videoTracks.first!, outputSettings: [kCVPixelBufferPixelFormatTypeKey as String: [kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange]])
-                inputTransform = videoTracks.first!.preferredTransform
+            let outputSettings: [String : Any]
+            if let videoTrack = videoTracks.first, videoTrack.preferredTransform.isIdentity && !self.configuration.values.requiresComposing {
+                outputSettings = [kCVPixelBufferPixelFormatTypeKey as String: [kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange]]
             } else {
-                videoOutput = AVAssetReaderTrackOutput(track: videoTracks.first!, outputSettings: [kCVPixelBufferPixelFormatTypeKey as String: kCVPixelFormatType_32BGRA])
-                inputTransform = nil
+                outputSettings = [kCVPixelBufferPixelFormatTypeKey as String: kCVPixelFormatType_32BGRA]
+                self.setupComposer()
             }
-            
+            let videoOutput = AVAssetReaderTrackOutput(track: videoTracks.first!, outputSettings: outputSettings)
             videoOutput.alwaysCopiesSampleData = false
             if reader.canAdd(videoOutput) {
                 reader.add(videoOutput)
@@ -334,7 +324,7 @@ public final class MediaEditorVideoExport {
             }
             self.videoOutput = videoOutput
             
-            writer.setupVideoInput(configuration: self.configuration, inputTransform: inputTransform)
+            writer.setupVideoInput(configuration: self.configuration)
         } else {
             self.videoOutput = nil
         }
@@ -363,12 +353,14 @@ public final class MediaEditorVideoExport {
     }
     
     private func setupWithImage(_ image: UIImage) {
+        self.setupComposer()
+        
         self.writer = MediaEditorVideoAVAssetWriter()
         guard let writer = self.writer else {
             return
         }
         writer.setup(configuration: self.configuration, outputPath: self.outputPath)
-        writer.setupVideoInput(configuration: self.configuration, inputTransform: nil)
+        writer.setupVideoInput(configuration: self.configuration)
     }
     
     private func finish() {
diff --git a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
index 9d3bd84021..2b4c1802af 100644
--- a/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
+++ b/submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
@@ -1528,7 +1528,7 @@ public final class MediaEditorScreen: ViewController {
                     duration = 5.0
                 }
             }
-            self.completion(.video(video: videoResult, coverImage: nil, values: mediaEditor.values, duration: duration, dimensions: PixelDimensions(width: 1080, height: 1920), caption: caption), { [weak self] in
+            self.completion(.video(video: videoResult, coverImage: nil, values: mediaEditor.values, duration: duration, dimensions: PixelDimensions(width: 720, height: 1280), caption: caption), { [weak self] in
                 self?.node.animateOut(finished: true, completion: { [weak self] in
                     self?.dismiss()
                 })