diff --git a/app/css/app.css b/app/css/app.css
index 28a09732..6a88ddf8 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -1237,8 +1237,7 @@ a.im_dialog_selected .im_dialog_date {
 .im_message_fwd_photo {
   width: 34px;
   height: 34px;
-
-  border-radius: 2px;
+  border-radius: 50%;
   overflow: hidden;
 }
 .im_message_from_photo .peer_initials,
diff --git a/app/css/desktop.css b/app/css/desktop.css
index fc88be0d..2dd25631 100644
--- a/app/css/desktop.css
+++ b/app/css/desktop.css
@@ -336,6 +336,19 @@ a.footer_link.active:active {
   color: #FFF;
 }
 
+.icon-message-status {
+  pointer-events: none;
+  background: #6ba2cb;
+  border: 0;
+  display: block;
+  width: 10px;
+  height: 10px;
+  border-radius: 7px;
+  position: absolute;
+  margin-left: -26px;
+  margin-top: 13px;
+  opacity: 0;
+}
 .im_message_unread .icon-message-status {
   opacity: 1.0;
 }
@@ -458,6 +471,11 @@ a.footer_link.active:active {
   vertical-align: bottom;
 }
 
+@media (max-height: 600px) {
+  .footer_wrap {
+    display: none;
+  }
+}
 
 @media (max-width: 900px) {
 
diff --git a/app/js/directives.js b/app/js/directives.js
index 65df89ef..895e3052 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -628,11 +628,11 @@ angular.module('myApp.directives', ['myApp.filters'])
         }
 
         if (attrs.modal) {
-          $(element).css({
-            height: $($window).height() -
-                    (panelWrap ? panelWrap.offsetHeight : 58) -
-                    (Config.Mobile ? 46 : 200)
-          });
+          var height = $($window).height() -
+                        (panelWrap ? panelWrap.offsetHeight : 58) -
+                        (Config.Mobile ? 46 : 200);
+          height = Math.min(350, height);
+          $(element).css({height: height});
           updateScroller();
           return;
         }
diff --git a/app/partials/desktop/peer_select.html b/app/partials/desktop/peer_select.html
index 4cd09b9b..0f1ac9c0 100644
--- a/app/partials/desktop/peer_select.html
+++ b/app/partials/desktop/peer_select.html
@@ -52,7 +52,7 @@
   </div>
 
   <div class="md_modal_footer peer_select_modal_footer clearfix" ng-if="multiSelect">
-    <button class="btn btn-md pull-right" ng-click="submitSelected()"  ng-class="{disabled: !selectedCount}" ng-disabled="!selectedCount" my-i18n="conversations_modal_forward_submit"></button>
+    <button class="btn btn-md pull-right" ng-click="submitSelected()" my-i18n="conversations_modal_forward_submit"></button>
 
     <div class="peer_select_modal_recipients_wrap" ng-switch="!selectedCount">
       <span class="peer_select_modal_recipients_empty" ng-switch-when="true" my-i18n="conversations_modal_select_recipients"></span>