2.5/11 added new mail functional + refactored actions