Fix sending basic mail
Fix packaged mail