diff --git a/deployment/migrations/scripts/0003-fix-message-time.py b/deployment/migrations/scripts/0003-fix-message-time.py
new file mode 100644
index 000000000..310b1968a
--- /dev/null
+++ b/deployment/migrations/scripts/0003-fix-message-time.py
@@ -0,0 +1,50 @@
+"""
+This migration fixes the "time" field of messages. It was incorrectly updated when fetching
+messages from the on-chain storage.
+
+We now store the original message time in the "time" field, and we store the confirmation time
+in the confirmations array. To achieve this, we must fetch the whole message history and
+process it again.
+"""
+
+import logging
+
+from configmanager import Config
+
+from aleph.model.chains import Chain
+from aleph.model.messages import Message
+
+logger = logging.getLogger()
+
+
+async def must_run_migration() -> bool:
+    nb_documents = Message.collection.count_documents(
+        filter={"content.time": {"$exists": 1}, "$expr": {"$ne": ["$time", "$content.time"]}}
+    )
+    return bool(nb_documents)
+
+
+async def upgrade(config: Config, **kwargs):
+    if await must_run_migration():
+        logger.info("Messages with inconsistent times found, running migration.")
+        start_height = config.ethereum.start_height.value
+        await Chain.set_last_height("ETH", start_height)
+    else:
+        logger.info("Message times already set to the correct value, skipping migration.")
+
+    logger.info("Some queries may take a while to execute.")
+
+    # First, update all the messages that have a valid content.time field.
+    # This represents 99.99% of the messages in the DB, the only exception
+    # being forgotten messages.
+    filter = {"content.time": {"$exists": 1}}
+    update = [{"$set": {"time": "$content.time"}}]
+
+    logger.info("Resetting the time field on messages. This operation may take a while.")
+    await Message.collection.update_many(filter=filter, update=update)
+    logger.info("Reset message times to their original value.")
+
+
+def downgrade(**kwargs):
+    # Nothing to do, we do not wish to revert this migration.
+    pass
diff --git a/deployment/migrations/utils/__init__.py b/deployment/migrations/utils/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/deployment/migrations/utils/reset_chain_height.py b/deployment/migrations/utils/reset_chain_height.py
new file mode 100644
index 000000000..824de9904
--- /dev/null
+++ b/deployment/migrations/utils/reset_chain_height.py
@@ -0,0 +1,7 @@
+from configmanager import Config
+from aleph.model.chains import Chain
+
+
+async def reset_chain_height(config: Config):
+    start_height = config.ethereum.start_height.value
+    await Chain.set_last_height("ETH", start_height)
diff --git a/src/aleph/jobs/process_pending_txs.py b/src/aleph/jobs/process_pending_txs.py
index fe750d063..dd389492f 100644
--- a/src/aleph/jobs/process_pending_txs.py
+++ b/src/aleph/jobs/process_pending_txs.py
@@ -38,8 +38,6 @@ async def handle_pending_tx(
     )
     if messages:
         for i, message in enumerate(messages):
-            message["time"] = tx_context.time + (i / 1000)  # force order
-
             try:
                 message = await check_message(
                     message, trusted=True