Show to-address like "Me (foo@bar.com)" if more than one identity is registered

This should fix #859 . After the discussion in #866 I worked on a new branch, so that one can be closed too, I guess.