Make patch2 compatible with the latest changes
Full email body is not nullable, require it