Pushes error detection down to a per e-mail level.

Error detection previously occurred on a batch-by-batch basis. This
pushes the catching of errors down to a per-email level.
Fixing indentaion with :retab