US804 - Encrypt hidden fields
US804 - fix message file issues