Merged c0ffee's MIME signal patch.