Merge "Put Email back into eclipse .classpath"