Removed MockMail reference

GUI now compiles
Merge remote-tracking branch 'origin/GUI' into develop