am 16818400: am 5ed8b266: Fix some problems with move message

* commit '16818400fc2f01d051e26f0ea4175d1822d6ad66':
  Fix some problems with move message