Ameliorate file attachment sending

Remove temporary attachments after sending
Fix the case without attachment
Treat both attachments