AMGA-15 Added support for point #22 from AMGA Emails