extracting to/cc addresses for stg mail

I'm new to stg, so maybe I'm missing the easy way to do this. That said, I'd like to maintain "To:" fields in the patch description, like this:

  Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
  To: Andi Kleen <andi@firstfloor.org>
  Cc: Andrew Morton <akpm@linux-foundation.org>

"stg mail --auto" takes care of adding Andrew to the Cc list, but I have to manually deal with Andi.

I've been doing that by using "stg mail --auto -E" and manually moving the To: line to the top, but that's a hassle. I don't really want to use "stg mail --to=", because then I have to dig out the To: line contents first. I don't really want to use different template files, because I often have one-off self- contained patches that go different places.

Is there a way to make stg pay attention to my "To:" lines in the patch description? Or another way to accomplish this?

Bjorn