Encrypted message is not being spellchecked anymore
canonicalize: add check for algorithm type

closes #797
Merge remote-tracking branch 'dakid/master'