Code

Implemented correct mail splitting (was taking a shortcut). Added unit