Fixes #1489 Empty attachments are not uploaded v2