rebased on attachmentme

@atombender