Cleanup and fixed encrypted file attachment transfers