diff --git a/TelegramCore/ChannelOwnershipTransfer.swift b/TelegramCore/ChannelOwnershipTransfer.swift
index cd9dd92ff2..578190af92 100644
--- a/TelegramCore/ChannelOwnershipTransfer.swift
+++ b/TelegramCore/ChannelOwnershipTransfer.swift
@@ -14,6 +14,8 @@ public enum ChannelOwnershipTransferError {
     case authSessionTooFresh(Int32)
     case requestPassword
     case invalidPassword
+    case restricted
+    case userBlocked
 }
 
 public func updateChannelOwnership(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, channelId: PeerId, memberId: PeerId, password: String?) -> Signal<Never, ChannelOwnershipTransferError> {
@@ -72,6 +74,10 @@ public func updateChannelOwnership(postbox: Postbox, network: Network, accountSt
                     if let value = Int32(timeout) {
                         return .authSessionTooFresh(value)
                     }
+                } else if error.errorDescription == "USER_PRIVACY_RESTRICTED" {
+                    return .restricted
+                } else if error.errorDescription == "USER_BLOCKED" {
+                    return .userBlocked
                 }
                 return .generic
             }
diff --git a/TelegramCore/TextEntitiesMessageAttribute.swift b/TelegramCore/TextEntitiesMessageAttribute.swift
index e2718bb942..16f27b8917 100644
--- a/TelegramCore/TextEntitiesMessageAttribute.swift
+++ b/TelegramCore/TextEntitiesMessageAttribute.swift
@@ -302,13 +302,13 @@ func apiEntitiesFromMessageTextEntities(_ entities: [MessageTextEntity], associa
             case .PhoneNumber:
                 break
             case .Strikethrough:
-                //apiEntities.append(.messageEntityStrike(offset: offset, length: length))
+                apiEntities.append(.messageEntityStrike(offset: offset, length: length))
                 break
             case .BlockQuote:
-                //apiEntities.append(.messageEntityBlockquote(offset: offset, length: length))
+                apiEntities.append(.messageEntityBlockquote(offset: offset, length: length))
                 break
             case .Underline:
-                //apiEntities.append(.messageEntityUnderline(offset: offset, length: length))
+                apiEntities.append(.messageEntityUnderline(offset: offset, length: length))
                 break
             case .Custom:
                 break
diff --git a/TelegramCore_Xcode.xcodeproj/project.pbxproj b/TelegramCore_Xcode.xcodeproj/project.pbxproj
index e7ba98a165..c35cf28d1a 100644
--- a/TelegramCore_Xcode.xcodeproj/project.pbxproj
+++ b/TelegramCore_Xcode.xcodeproj/project.pbxproj
@@ -139,6 +139,8 @@
 		D0119CB120CA9EA800895300 /* MarkAllChatsAsRead.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0119CAF20CA9EA800895300 /* MarkAllChatsAsRead.swift */; };
 		D0136309208F3B0900EB3653 /* SecureIdValueContentError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0136308208F3B0900EB3653 /* SecureIdValueContentError.swift */; };
 		D013630A208F6E2800EB3653 /* SecureIdValueContentError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0136308208F3B0900EB3653 /* SecureIdValueContentError.swift */; };
+		D014193922AE6B85008667CB /* ChannelOwnershipTransfer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778222A9862100CD99F5 /* ChannelOwnershipTransfer.swift */; };
+		D014193A22AE6B85008667CB /* PeersNearby.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E778F22AAABC600CD99F5 /* PeersNearby.swift */; };
 		D015E00E225CA61100CB9E8A /* FindChannelById.swift in Sources */ = {isa = PBXBuildFile; fileRef = D015E00D225CA61100CB9E8A /* FindChannelById.swift */; };
 		D015E00F225CA61100CB9E8A /* FindChannelById.swift in Sources */ = {isa = PBXBuildFile; fileRef = D015E00D225CA61100CB9E8A /* FindChannelById.swift */; };
 		D01749591E1092BC0057C89A /* RequestStartBot.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01749581E1092BC0057C89A /* RequestStartBot.swift */; };
@@ -2622,6 +2624,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D014193922AE6B85008667CB /* ChannelOwnershipTransfer.swift in Sources */,
+				D014193A22AE6B85008667CB /* PeersNearby.swift in Sources */,
 				D076F88A2296D8F6004F895A /* ManageChannelDiscussionGroup.swift in Sources */,
 				9F1BC1AB2244CFED00F21815 /* EmojiKeywords.swift in Sources */,
 				9F1BC1AC2244CFED00F21815 /* SynchronizeEmojiKeywordsOperation.swift in Sources */,