Fix describe block string
Update mailer to account for special content uploads as well.
First cut at tests.