Change Log 2013-12-26-A

1: Minor modifications to mail handling code
2: Streamline code to handle values uniformly in mail related functions