fix show_offline_envelope
Merge branch 'master' into portable