MDL-41369 Pass viewing argument to more message screens