修改
Merge branch 'master' of https://github.com/dongql/mail.git

Conflicts:
	src/mail/action/EmailAction.java