Work in progress, fix for transferring attachments to the server