Simplify text/html picker. Fix multipart/alternative preference.