Fix bug 1057286: Split file attachments into a separate application

Don't merge!