diff --git a/app/js/controllers.js b/app/js/controllers.js
index dba53865..fe21836e 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -1595,10 +1595,11 @@ angular.module('myApp.controllers', ['myApp.i18n'])
           }
           if (target.className &&
             target.className.indexOf('im_message_date') != -1) {
-            if ($scope.historyState.canReply) {
-              selectedReply(messageID)
-            } else {
+            if (AppPeersManager.isChannel(peerID) &&
+                !AppPeersManager.isMegagroup(peerID)) {
               quickForward(messageID)
+            } else {
+              selectedReply(messageID)
             }
             return false
           }
diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js
index e50d2ea3..c95ced91 100644
--- a/app/js/messages_manager.js
+++ b/app/js/messages_manager.js
@@ -942,7 +942,11 @@ angular.module('myApp.services')
         return $q.reject()
       }
       var message = getMessage(fullMsgID)
-      if (!message || !message.pFlags || !message.pFlags.post) {
+      var channel = AppChatsManager.getChat(channelID)
+      if (!message ||
+          !message.pFlags ||
+          !message.pFlags.post ||
+          !channel.username) {
         return $q.reject()
       }
       return MtpApiManager.invokeApi('channels.exportMessageLink', {