First task improved and bugfix added to mail system.