diff --git a/app/js/controllers.js b/app/js/controllers.js
index db1174a3..21da89f5 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -2196,6 +2196,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
         $scope.$broadcast('ui_message_send');
       }
       delete $scope.draftMessage.sticker;
+      resetDraft();
     }
 
     function onCommandSelected (command) {
@@ -2203,8 +2204,10 @@ angular.module('myApp.controllers', ['myApp.i18n'])
         return;
       }
       AppMessagesManager.sendText($scope.curDialog.peerID, command);
+      resetDraft();
       delete $scope.draftMessage.sticker;
       delete $scope.draftMessage.text;
+      delete $scope.draftMessage.command;
       $scope.$broadcast('ui_message_send');
       $scope.$broadcast('ui_peer_draft');
     }
diff --git a/app/less/app.less b/app/less/app.less
index 6223d3f5..cabee4d3 100644
--- a/app/less/app.less
+++ b/app/less/app.less
@@ -2053,6 +2053,7 @@ a.im_message_fwd_photo {
   margin-bottom: 0;
   max-height: 300px;
   overflow: auto;
+  padding: 4px;
 }
 .im_message_photo_caption,
 .im_message_video_caption {