Avatars in annotations not underlined. Fixes #395