Fixes
Added SMTP pickup directory settings
Fixed issue #137
Fixed issue #129