small changes on handle Email Loading
javadoc changes