Conditionally render secure message button, update add counterparty form

Conditionally render secure message button, update add counterparty form #942