Add move cursor to attachments, fix prefixes