Revert "Add separate message widget for signature form fields"
This reverts commit c810539e6579ff2df0a4f0bd654c3773ce87da40.