Fix various issues in Mailvelope integration (#1490533)

Aleksander Machniak

2015-09-20 82dcbb7488ce1625ba4f41fbdc8e6319d3da9691

 program/steps/mail/compose.inc

@@ -88,7 +88,7 @@
    'selectimportfile', 'messageissent', 'loadingdata', 'nopubkeyfor', 'nopubkeyforsender',
    'encryptnoattachments','encryptedsendialog','searchpubkeyservers', 'importpubkeys',
    'encryptpubkeysfound',  'search', 'close', 'import', 'keyid', 'keylength', 'keyexpired',
    'keyrevoked');
    'keyrevoked', 'keyimportsuccess', 'keyservererror');

$OUTPUT->set_pagetitle($RCMAIL->gettext('compose'));

@@ -788,7 +788,6 @@
                            '_uid'  => $MESSAGE->uid,
                            '_part' => $pgp_mime_part->mime_id,
                        ));
                        $RCMAIL->output->set_env('compose_mode', $compose_mode);
                    }
                    continue;
                }
@@ -876,7 +875,7 @@
    }

    // register this part as pgp encrypted
    if (strpos($body, 'BEGIN PGP MESSAGE') !== false) {
    if (strpos($body, '-----BEGIN PGP MESSAGE-----') !== false) {
        $MESSAGE->pgp_mime = true;
        $RCMAIL->output->set_env('pgp_mime_message', array(
            '_mbox' => $RCMAIL->storage->get_folder(), '_uid' => $MESSAGE->uid, '_part' => $part->mime_id,