diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index dad561d..9d09433 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -543,7 +543,7 @@ public class Plaintext implements Streamable {
         private long sent;
         private Long received;
         private Status status;
-        private Set<Label> labels = new HashSet<>();
+        private Set<Label> labels = new LinkedHashSet<>();
         private long ttl;
         private int retries;
         private Long nextTry;
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index 435e54f..442a6bb 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -205,11 +205,11 @@ public class JdbcMessageRepository extends AbstractMessageRepository implements
         byte[] childIV = message.getInventoryVector().getHash();
         // save new parents
         int order = 0;
-        for (InventoryVector parentIV : message.getParents()) {
-            Plaintext parent = getMessage(parentIV);
-            mergeConversations(connection, parent.getConversationId(), message.getConversationId());
-            order++;
-            try (PreparedStatement ps = connection.prepareStatement("INSERT INTO Message_Parent VALUES (?, ?, ?, ?)")) {
+        try (PreparedStatement ps = connection.prepareStatement("INSERT INTO Message_Parent VALUES (?, ?, ?, ?)")) {
+            for (InventoryVector parentIV : message.getParents()) {
+                Plaintext parent = getMessage(parentIV);
+                mergeConversations(connection, parent.getConversationId(), message.getConversationId());
+                order++;
                 ps.setBytes(1, parentIV.getHash());
                 ps.setBytes(2, childIV);
                 ps.setInt(3, order); // FIXME: this might not be necessary