Email message controller changes