make messages link optional
fix support for variables in texts