Merge branch 'develop' of https://github.com/friendica/friendica into develop

diff --combined mod/message.php
index 223976ddbef637731dc24877e22c14735622924a,7377ba5e48a74d88210c51fbe31a0197ba617ba8..d0a583967b047c3a61a6261f5dd10f9f6657693c
--- 1/mod/message.php
--- 2/mod/message.php
+++ b/mod/message.php
@@@ -92,7 -92,7 +92,7 @@@ function message_post(App $a
                $a->argc = 2;
                $a->argv[1] = 'new';
        } else {
-               goaway($_SESSION['return_url']);
+               goaway($a->cmd . '/' . $ret);
        }
  }
  
@@@ -488,7 -488,7 +488,7 @@@ function render_messages(array $msg, $t
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
                        '$from_url' => Contact::magicLink($rr['url']),
 -                      '$from_addr' => $contact['addr'],
 +                      '$from_addr' => defaults($contact, 'addr', ''),
                        '$sparkle' => ' sparkle',
                        '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
                        '$subject' => $subject_e,

diff --combined view/theme/frio/js/modal.js
index 9a15cab52a67862845b5482dbd69bb52d13637bd,3f96eeca7de28f805ddfeaea9bf374a4f10f2269..80694b64da52971d890adf9be0fa130975b15b0d
--- 1/view/theme/frio/js/modal.js
--- 2/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@@ -188,25 -188,14 +188,25 @@@ function loadModalTitle() 
        }
  }
  
 -// This function loads html content from a friendica page
 -// into a modal.
 -function addToModal(url) {
 +
 +/**
 + * This function loads html content from a friendica page into a modal.
 + * 
 + * @param {string} url The url with html content.
 + * @param {string} id The ID of a html element (can be undefined).
 + * @returns {void}
 + */
 +function addToModal(url, id) {
        var char = qOrAmp(url);
  
        url = url + char + 'mode=none';
        var modal = $('#modal').modal();
  
 +      // Only search for an element if we have an ID.
 +      if (typeof id !== "undefined") {
 +              url = url + " div#" + id;
 +      }
 +
        modal
                .find('#modal-body')
                .load(url, function (responseText, textStatus) {
@@@ -226,7 -215,7 +226,7 @@@
                });
  }
  
 -// Add a element (by it's id) to a bootstrap modal.
 +// Add an element (by its id) to a bootstrap modal.
  function addElmToModal(id) {
        var elm = $(id).html();
        var modal = $('#modal').modal();
@@@ -343,6 -332,8 +343,8 @@@ function toggleJotNav (elm) 
        // For some some tab panels we need to execute other js functions.
        if (tabpanel === "jot-preview-content") {
                preview_post();
+               // Make Share button visivle in preview
+               $('#jot-preview-share').removeClass("minimize").attr("aria-hidden" ,"false");
        } else if (tabpanel === "jot-fbrowser-wrapper") {
                $(function() {
                        Dialog.showJot();