fix to message to not use account class