1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/client/TnvzHelper.java b/src/main/java/at/gv/egiz/moazs/client/TnvzHelper.java
index de22805..a304bdf 100644
--- a/src/main/java/at/gv/egiz/moazs/client/TnvzHelper.java
+++ b/src/main/java/at/gv/egiz/moazs/client/TnvzHelper.java
@@ -96,18 +96,16 @@ public class TnvzHelper {
 
         var builder = metaDataBuilder();
 
-        var meta = request.getTnvzMetaData();
-
+        var meta = request.getMetaData();
         if (meta.getDeliveryQuality() != null) {
             builder.withDeliveryQuality(meta.getDeliveryQuality());
         } else {
             builder.withPrivateMessageQuality(meta.getPrivateMessageQuality());
         }
 
-        return builder
-                .withOrigin(meta.getOrigin())
-                .withPreAdviceNote(request.getReceiver().getPreAdviceNote())
+        return builder.withOrigin(meta.getOrigin())
                 .withIgnorePostRedirectionOrder(meta.getIgnorePostRedirectionOrder())
+                .withPreAdviceNote(request.getReceiver().getPreAdviceNote())
                 .build();
     }