mail bugfix continuation.