fix EmailComponent