Subject annotation, and long message support