Call message client caller, move some things around