Update EmailCommons.php