Missing $message var reference removed from mail layouts