Adjustments for Email Library