Fixed preformatted inclusion in messages without gpg.
Fixed reply in gpg messages.
Merge branch 'hotfix/1.8.0.1'