diff --git a/submodules/InvisibleInkDustNode/Sources/InvisibleInkDustNode.swift b/submodules/InvisibleInkDustNode/Sources/InvisibleInkDustNode.swift
index a90a3df2ad..91a408c9f2 100644
--- a/submodules/InvisibleInkDustNode/Sources/InvisibleInkDustNode.swift
+++ b/submodules/InvisibleInkDustNode/Sources/InvisibleInkDustNode.swift
@@ -173,10 +173,7 @@ public class InvisibleInkDustNode: ASDisplayNode {
                 self?.emitterNode.view.mask = nil
             })
             self.emitterMaskFillNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
-            
-//            let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .linear)
-//            transition.updateAlpha(node: self, alpha: 0.0)
-                        
+                                    
             self.isRevealedUpdated(true)
         }
         
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorController.h
index 3235543022..62135820a5 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorController.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorController.h
@@ -64,7 +64,7 @@ typedef enum {
 
 @property (nonatomic, strong) TGPhotoEntitiesContainerView *entitiesView;
 
-- (instancetype)initWithContext:(id<LegacyComponentsContext>)context item:(id<TGMediaEditableItem>)item intent:(TGPhotoEditorControllerIntent)intent adjustments:(id<TGMediaEditAdjustments>)adjustments caption:(NSString *)caption screenImage:(UIImage *)screenImage availableTabs:(TGPhotoEditorTab)availableTabs selectedTab:(TGPhotoEditorTab)selectedTab;
+- (instancetype)initWithContext:(id<LegacyComponentsContext>)context item:(id<TGMediaEditableItem>)item intent:(TGPhotoEditorControllerIntent)intent adjustments:(id<TGMediaEditAdjustments>)adjustments caption:(NSAttributedString *)caption screenImage:(UIImage *)screenImage availableTabs:(TGPhotoEditorTab)availableTabs selectedTab:(TGPhotoEditorTab)selectedTab;
 
 - (void)dismissEditor;
 - (void)applyEditor;
diff --git a/submodules/LegacyComponents/Sources/TGClipboardGalleryModel.m b/submodules/LegacyComponents/Sources/TGClipboardGalleryModel.m
index a66273db3a..ca5c567869 100644
--- a/submodules/LegacyComponents/Sources/TGClipboardGalleryModel.m
+++ b/submodules/LegacyComponents/Sources/TGClipboardGalleryModel.m
@@ -305,7 +305,7 @@
     
     PGPhotoEditorValues *editorValues = (PGPhotoEditorValues *)[item.editingContext adjustmentsForItem:item.editableMediaItem];
     
-    NSString *caption = [item.editingContext captionForItem:item.editableMediaItem];
+    NSAttributedString *caption = [item.editingContext captionForItem:item.editableMediaItem];
     
     CGRect refFrame = CGRectZero;
     UIView *editorReferenceView = [self referenceViewForItem:item frame:&refFrame];
diff --git a/submodules/LegacyComponents/Sources/TGPhotoEditorController.m b/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
index cda57e13a9..1bba112b04 100644
--- a/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
+++ b/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
@@ -94,7 +94,7 @@
     bool _scheduledVideoPlayback;
     
     id<TGMediaEditAdjustments> _initialAdjustments;
-    NSString *_caption;
+    NSAttributedString *_caption;
     
     bool _viewFillingWholeScreen;
     bool _forceStatusBarVisible;
@@ -139,7 +139,7 @@
 
 @synthesize actionHandle = _actionHandle;
 
-- (instancetype)initWithContext:(id<LegacyComponentsContext>)context item:(id<TGMediaEditableItem>)item intent:(TGPhotoEditorControllerIntent)intent adjustments:(id<TGMediaEditAdjustments>)adjustments caption:(NSString *)caption screenImage:(UIImage *)screenImage availableTabs:(TGPhotoEditorTab)availableTabs selectedTab:(TGPhotoEditorTab)selectedTab
+- (instancetype)initWithContext:(id<LegacyComponentsContext>)context item:(id<TGMediaEditableItem>)item intent:(TGPhotoEditorControllerIntent)intent adjustments:(id<TGMediaEditAdjustments>)adjustments caption:(NSAttributedString *)caption screenImage:(UIImage *)screenImage availableTabs:(TGPhotoEditorTab)availableTabs selectedTab:(TGPhotoEditorTab)selectedTab
 {
     self = [super initWithContext:context];
     if (self != nil)
@@ -2292,7 +2292,7 @@
         _documentController.delegate = self;
         [_documentController setUTI:@"com.instagram.exclusivegram"];
         if (_caption.length > 0)
-            [_documentController setAnnotation:@{@"InstagramCaption" : _caption}];
+            [_documentController setAnnotation:@{@"InstagramCaption" : _caption.string}];
         [_documentController presentOpenInMenuFromRect:self.view.frame inView:self.view animated:true];
     }];
 }