fix decrypt message
Merged 'dev'.