Tidy some code for attachments as per Rui Lopes. rename() doesn't work too
well on Win32 systems anyway, and some other OSes have some strange behaviour