diff --git a/app/js/directives.js b/app/js/directives.js
index 9ad94239..dea32299 100755
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -2287,7 +2287,12 @@ angular.module('myApp.directives', ['myApp.filters'])
 
       element.attr('src', 'img/blank.gif')
 
-      var src = 'https://maps.googleapis.com/maps/api/staticmap?sensor=false&center=' + $scope.point['lat'] + ',' + $scope.point['long'] + '&zoom=' + zoom + '&size=' + width + 'x' + height + '&scale=2&key=' + apiKey
+      var src = 'https://maps.googleapis.com/maps/api/staticmap?sensor=false&center=' + $scope.point['lat'] + ',' + $scope.point['long'] + '&zoom=' + zoom + '&size=' + width + 'x' + height + '&scale=2&markers=color:red|size:big|' + $scope.point['lat'] + ',' + $scope.point['long']
+      var useApiKey = false
+
+      if (useApiKey) {
+        src += '&key=' + apiKey
+      }
 
       ExternalResourcesManager.downloadByURL(src).then(function (url) {
         element.attr('src', url.valueOf())
diff --git a/app/partials/desktop/message_attach_geo.html b/app/partials/desktop/message_attach_geo.html
index 04bdfb18..109612e5 100644
--- a/app/partials/desktop/message_attach_geo.html
+++ b/app/partials/desktop/message_attach_geo.html
@@ -1,5 +1,4 @@
 <a ng-href="{{::media.mapUrl}}" target="_blank" rel="noopener noreferrer" class="im_message_geopoint">
-  <i class="icon icon-geo-point"></i>
   <img
     class="im_message_venue_geopoint_image"
     my-geo-point-map="media.geo"
diff --git a/app/partials/desktop/message_attach_venue.html b/app/partials/desktop/message_attach_venue.html
index 4e5a34c8..2818ee94 100644
--- a/app/partials/desktop/message_attach_venue.html
+++ b/app/partials/desktop/message_attach_venue.html
@@ -1,7 +1,6 @@
 <div class="im_message_venue clearfix">
 
   <a ng-href="{{::media.mapUrl}}" target="_blank" rel="noopener noreferrer" class="im_message_venue_geopoint_wrap">
-    <i class="icon icon-geo-point"></i>
     <img
       class="im_message_venue_geopoint_image"
       my-geo-point-map="media.geo"
diff --git a/app/partials/desktop/short_message.html b/app/partials/desktop/short_message.html
index 1fa7b4d4..f07d340b 100644
--- a/app/partials/desktop/short_message.html
+++ b/app/partials/desktop/short_message.html
@@ -50,4 +50,4 @@
     </my-i18n-param>
   </span>
 
-</span><span class="im_short_message_text" ng-if="message.message.length" ng-bind-html="message.richMessage"></span>
\ No newline at end of file
+</span><span class="im_short_message_text" ng-if="message.message.length && !message.media" ng-bind-html="message.richMessage"></span>
\ No newline at end of file
diff --git a/app/partials/mobile/message_attach_geo.html b/app/partials/mobile/message_attach_geo.html
index 9481ef17..55151964 100644
--- a/app/partials/mobile/message_attach_geo.html
+++ b/app/partials/mobile/message_attach_geo.html
@@ -1,5 +1,4 @@
 <a ng-href="{{::media.mapUrl}}" target="_blank" class="im_message_geopoint">
-  <i class="icon icon-geo-point"></i>
   <img
     class="im_message_venue_geopoint_image"
     my-geo-point-map="media.geo"
diff --git a/app/partials/mobile/message_attach_venue.html b/app/partials/mobile/message_attach_venue.html
index 4e5a34c8..2818ee94 100644
--- a/app/partials/mobile/message_attach_venue.html
+++ b/app/partials/mobile/message_attach_venue.html
@@ -1,7 +1,6 @@
 <div class="im_message_venue clearfix">
 
   <a ng-href="{{::media.mapUrl}}" target="_blank" rel="noopener noreferrer" class="im_message_venue_geopoint_wrap">
-    <i class="icon icon-geo-point"></i>
     <img
       class="im_message_venue_geopoint_image"
       my-geo-point-map="media.geo"