diff --git a/app/js/lib/utils.js b/app/js/lib/utils.js
index 6719426b..09b7a2a2 100644
--- a/app/js/lib/utils.js
+++ b/app/js/lib/utils.js
@@ -380,6 +380,8 @@ function templateUrl (tplName) {
     media_modal_layout: 'desktop',
     slider: 'desktop',
     reply_message: 'desktop',
+    message_body: 'desktop',
+    message_media: 'desktop',
     forwarded_messages: 'desktop',
     chat_invite_link_modal: 'desktop',
     reply_markup: 'desktop',
diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js
index 68f72c3a..e6b94b29 100644
--- a/app/js/messages_manager.js
+++ b/app/js/messages_manager.js
@@ -1682,9 +1682,9 @@ angular.module('myApp.services')
       case 'inputMediaContact':
         media = {
           _: 'messageMediaContact',
-          phone_number: phone_number,
-          first_name: first_name,
-          last_name: last_name,
+          phone_number: inputMedia.phone_number,
+          first_name: inputMedia.first_name,
+          last_name: inputMedia.last_name,
           user_id: 0
         };
         break;
diff --git a/app/js/services.js b/app/js/services.js
index eb5831bf..c09c275d 100755
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -2666,8 +2666,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
       } else {
         var html = RichTextProcessor.wrapRichText(callbackAnswer.message, {noLinks: true, noLinebreaks: true}).valueOf();;
         toaster.pop({
-          type: 'material',
-          timeout: 100000,
+          type: 'info',
+          // timeout: 100000,
           body: html,
           bodyOutputType: 'trustedHtml',
           showCloseButton: false
@@ -2741,10 +2741,10 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
               'lat': inlineResult.send_message.geo['lat'],
               'long': inlineResult.send_message.geo['long']
             },
-            title: title,
-            address: address,
-            provider: provider,
-            venue_id: venue_id
+            title: inlineResult.send_message.title,
+            address: inlineResult.send_message.address,
+            provider: inlineResult.send_message.provider,
+            venue_id: inlineResult.send_message.venue_id
           };
           break;
 
diff --git a/app/partials/desktop/message_attach_venue.html b/app/partials/desktop/message_attach_venue.html
index 3f87569c..b0d8e9df 100644
--- a/app/partials/desktop/message_attach_venue.html
+++ b/app/partials/desktop/message_attach_venue.html
@@ -1,21 +1,21 @@
 <div class="im_message_venue clearfix">
 
-  <a ng-href="{{::venue.mapUrl}}" target="_blank" class="im_message_venue_geopoint_wrap">
+  <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_venue_geopoint_wrap">
     <i class="icon icon-geo-point"></i>
     <img
       class="im_message_venue_geopoint_image"
-      my-geo-point-map="venue.geo"
+      my-geo-point-map="media.geo"
       width="100"
       height="100"
-      alt="[{{::'conversation_media_location' | i18n}} {{::venue.mapUrl}}]"
+      alt="[{{::'conversation_media_location' | i18n}} {{::media.mapUrl}}]"
     />
   </a>
 
   <div class="im_message_venue_info">
     <div class="im_message_venue_title_wrap">
-      <a ng-href="{{::venue.mapUrl}}" target="_blank" class="im_message_document_name" ng-bind="::venue.title"></a>
+      <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_document_name" ng-bind="::media.title"></a>
     </div>
-    <div class="im_message_venue_address" ng-bind="::venue.address"></div>
+    <div class="im_message_venue_address" ng-bind="::media.address"></div>
   </div>
 
 </div>
diff --git a/app/partials/mobile/im.html b/app/partials/mobile/im.html
index 64857559..84cfed55 100644
--- a/app/partials/mobile/im.html
+++ b/app/partials/mobile/im.html
@@ -194,4 +194,4 @@
 
 </div>
 
-<toaster-container></toaster-container>
\ No newline at end of file
+<toaster-container toaster-options="{'position-class': 'toast-bottom-center'}"></toaster-container>
\ No newline at end of file
diff --git a/app/partials/mobile/message.html b/app/partials/mobile/message.html
index ad5c2c15..3b2c059c 100644
--- a/app/partials/mobile/message.html
+++ b/app/partials/mobile/message.html
@@ -40,38 +40,28 @@
         <span class="im_message_date" ng-bind="::historyMessage.date | time"></span>
       </div>
 
-      <div class="im_message_body" ng-class="::{im_message_body_media: historyMessage._ == 'message' &amp;&amp; historyMessage.media && historyMessage.media._ != 'messageMediaWebPage' && !historyMessage.media.rCaption && !historyMessage.viaBotID ? true : false}">
+      <div my-message-body="historyMessage">
+        <div class="im_message_body" ng-class="::{im_message_body_media: historyMessage._ == 'message' &amp;&amp; historyMessage.media && historyMessage.media._ != 'messageMediaWebPage' && !historyMessage.media.rCaption && !historyMessage.viaBotID ? true : false}">
 
-        <a class="im_message_author" my-peer-link="historyMessage.fromID" short="historyMessage.toID > 0" color="historyMessage.toID < 0" no-watch="true"></a>
-        <a ng-if="::historyMessage.viaBotID && !historyMessage.fwdFromID" class="im_message_author_via" my-i18n="message_via_bot" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"><my-i18n-param name="bot"><span class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></span></my-i18n-param></a>
+          <a class="im_message_author" my-peer-link="historyMessage.fromID" short="historyMessage.toID > 0" color="historyMessage.toID < 0" no-watch="true"></a>
+          <a ng-if="::historyMessage.viaBotID && !historyMessage.fwdFromID" class="im_message_author_via" my-i18n="message_via_bot" ng-click="selectInlineBot(historyMessage.viaBotID, $event)"><my-i18n-param name="bot"><span class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></span></my-i18n-param></a>
 
-        <a class="im_message_reply_wrap" my-reply-message="historyMessage.reply_to_msg" ng-if="::historyMessage.reply_to_mid"></a>
+          <a class="im_message_reply_wrap" my-reply-message="historyMessage.reply_to_msg" ng-if="::historyMessage.reply_to_mid"></a>
 
-        <div ng-if="::!!historyMessage.fwdFromID &amp;&amp; !historyMessage.media" class="im_message_fwd_header" ng-switch="!!historyMessage.viaBotID" my-i18n>
-          <span ng-switch-when="true" my-i18n-format="message_forwarded_via_message_mobile"></span>
-          <span ng-switch-default my-i18n-format="message_forwarded_message_mobile"></span>
-          <my-i18n-param name="from"><a class="im_message_fwd_author" my-peer-link="historyMessage.fwdFromID" no-watch="true"></a></my-i18n-param>
-          <my-i18n-param name="bot"><a class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></a></my-i18n-param>
-        </div>
-
-        <div class="im_message_text" ng-if="::historyMessage.message.length || false" my-message-text="::historyMessage" dir="auto"></div>
-
-        <div ng-if="::historyMessage.media || historyMessage.mid < 0 ? true : false" class="im_message_media" ng-switch="historyMessage.media._">
-
-          <div ng-switch-when="messageMediaPhoto"     my-message-photo="historyMessage.media" message-id="historyMessage.mid"></div>
-          <div ng-switch-when="messageMediaDocument"  my-message-document="historyMessage.media" message-id="historyMessage.mid"></div>
-          <div ng-switch-when="messageMediaGeo"       my-message-geo="historyMessage.media"></div>
-          <div ng-switch-when="messageMediaVenue"     my-message-venue="historyMessage.media"></div>
-          <div ng-switch-when="messageMediaContact"   my-message-contact></div>
-          <div ng-switch-when="messageMediaWebPage"   my-message-webpage="historyMessage.media.webpage" message-id="historyMessage.mid"></div>
-          <div ng-switch-when="messageMediaPending"   my-message-pending></div>
-          <div ng-switch-when="messageMediaUnsupported">
-            <div class="im_message_text">
-              The message is not supported on your version of Telegram Web. Update the app to view: <a href="https://web.telegram.org">web.telegram.org</a>.
-            </div>
+          <div ng-if="::!!historyMessage.fwdFromID &amp;&amp; !historyMessage.media" class="im_message_fwd_header" ng-switch="!!historyMessage.viaBotID" my-i18n>
+            <span ng-switch-when="true" my-i18n-format="message_forwarded_via_message_mobile"></span>
+            <span ng-switch-default my-i18n-format="message_forwarded_message_mobile"></span>
+            <my-i18n-param name="from"><a class="im_message_fwd_author" my-peer-link="historyMessage.fwdFromID" no-watch="true"></a></my-i18n-param>
+            <my-i18n-param name="bot"><a class="im_message_fwd_author" my-peer-link="historyMessage.viaBotID" username="true" no-watch="true"></a></my-i18n-param>
           </div>
 
+          <div class="im_message_text" dir="auto"></div>
+          <div class="im_message_media"></div>
+
         </div>
+
+        <div class="im_message_keyboard"></div>
+
       </div>
 
     </div>
diff --git a/app/partials/mobile/message_attach_venue.html b/app/partials/mobile/message_attach_venue.html
index a0657a32..b0d8e9df 100644
--- a/app/partials/mobile/message_attach_venue.html
+++ b/app/partials/mobile/message_attach_venue.html
@@ -1,20 +1,21 @@
 <div class="im_message_venue clearfix">
 
-  <a ng-href="{{::venue.mapUrl}}" target="_blank" class="im_message_venue_geopoint_wrap">
+  <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_venue_geopoint_wrap">
     <i class="icon icon-geo-point"></i>
     <img
       class="im_message_venue_geopoint_image"
-      my-geo-point-map="venue.geo"
+      my-geo-point-map="media.geo"
       width="100"
       height="100"
+      alt="[{{::'conversation_media_location' | i18n}} {{::media.mapUrl}}]"
     />
   </a>
 
   <div class="im_message_venue_info">
     <div class="im_message_venue_title_wrap">
-      <a ng-href="{{::venue.mapUrl}}" target="_blank" class="im_message_document_name" ng-bind="::venue.title"></a>
+      <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_document_name" ng-bind="::media.title"></a>
     </div>
-    <div class="im_message_venue_address" ng-bind="::venue.address"></div>
+    <div class="im_message_venue_address" ng-bind="::media.address"></div>
   </div>
 
 </div>