diff --git a/TelegramCore/MultipartUpload.swift b/TelegramCore/MultipartUpload.swift
index de53ea8ded..35cfdc1546 100644
--- a/TelegramCore/MultipartUpload.swift
+++ b/TelegramCore/MultipartUpload.swift
@@ -348,7 +348,7 @@ func multipartUpload(network: Network, postbox: Postbox, source: MultipartUpload
                     case let .resource(resource):
                         dataSignal = postbox.mediaBox.resourceData(resource, option: .incremental(waitUntilFetchStatus: true)) |> map { MultipartUploadData.resourceData($0) }
                         headerSize = resource.headerSize
-                        fetchedResource = postbox.mediaBox.fetchedResource(resource)
+                        fetchedResource = postbox.mediaBox.fetchedResource(resource) |> map {_ in}
                     case let .data(data):
                         dataSignal = .single(.data(data))
                         headerSize = 0
diff --git a/TelegramCore/RequestEditMessage.swift b/TelegramCore/RequestEditMessage.swift
index c96e9866a8..9397909b1a 100644
--- a/TelegramCore/RequestEditMessage.swift
+++ b/TelegramCore/RequestEditMessage.swift
@@ -9,7 +9,7 @@ import Foundation
     import MtProtoKitDynamic
 #endif
 
-public func requestEditMessage(account: Account, messageId: MessageId, text: String, entities:TextEntitiesMessageAttribute? = nil) -> Signal<Bool, NoError> {
+public func requestEditMessage(account: Account, messageId: MessageId, text: String, entities:TextEntitiesMessageAttribute? = nil, disableUrlPreview: Bool = false) -> Signal<Bool, NoError> {
     return account.postbox.modify { modifier -> (Peer?, SimpleDictionary<PeerId, Peer>) in
             var peers:SimpleDictionary<PeerId, Peer> = SimpleDictionary()
 
@@ -35,7 +35,9 @@ public func requestEditMessage(account: Account, messageId: MessageId, text: Str
                     flags |= Int32(1 << 3)
                 }
                 
-                
+                if disableUrlPreview {
+                    flags |= Int32(1 << 1)
+                }
                 
                 return account.network.request(Api.functions.messages.editMessage(flags: flags, peer: inputPeer, id: messageId.id, message: text, replyMarkup: nil, entities: apiEntities))
                     |> map { result -> Api.Updates? in