Can you have an eye on horde/mime's FRAMEWORK_6_0 branch? I failed to properly rebase it on master because it contained merge conflicts in package.xml which I didn't want to deal with. So I cherry picked what looked most relevant from master. Hope it is a good match.