Martin, your message didn't reach me due to your "special" From header. You might want to consider not doing that. Your patch looks worthwhile, though I haven't tested it.