am 5ed8b266: Fix some problems with move message

* commit '5ed8b266a480ea413264abdb5042c58b29175df8':
  Fix some problems with move message