Merge branch 'rs/mailinfo-format-flowed'