diff --git a/src/items/tile.cpp b/src/items/tile.cpp index 4b7cb0fbac3..edd827db0e5 100644 --- a/src/items/tile.cpp +++ b/src/items/tile.cpp @@ -987,11 +987,13 @@ std::shared_ptr Tile::queryDestination(int32_t &, const std::shared_pt const auto &destThing = destTile->getTopDownItem(); if (destThing) { destItem = destThing->getItem(); - if (thing && thing->getItem()) { - const auto &destCylinder = destThing->getCylinder(); - if (destCylinder && !destCylinder->getContainer()) { - return destThing->getCylinder(); - } + const auto &thingItem = thing ? thing->getItem() : nullptr; + if (!thingItem || thingItem->getMailbox() != destItem->getMailbox()) { + return destTile; + } + const auto &destCylinder = destThing->getCylinder(); + if (destCylinder && !destCylinder->getContainer()) { + return destThing->getCylinder(); } } }