diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java
index f73fd1f86b856a832f4d7bc1f60db2e72a447fbd..d6c45c11a6021bddc0cb4cbb7ac6b89189c6200f 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/command/CommandController.java
@@ -90,7 +90,7 @@ public class CommandController {
 		}
 
 		private boolean isSendPostfachMailOrder(CreateCommand command) {
-			return command.getOrder() == CommandOrder.SEND_POSTFACH_MAIL || command.getOrder() == CommandOrder.SEND_POSTFACH_NACHRICHT;
+			return command.getOrder() == CommandOrder.SEND_POSTFACH_NACHRICHT;
 		}
 
 		CreateCommand prepareCommandForPostfachNachricht(CreateCommand command, String vorgangId) {
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/postfach/PostfachMailTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/postfach/PostfachMailTestFactory.java
index 4d2661b45aa7355d3eb52348f1e4292baa54cb41..bea7a39b6ed1b1679fde1f939ba50e3af2b06a95 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/postfach/PostfachMailTestFactory.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/postfach/PostfachMailTestFactory.java
@@ -72,7 +72,7 @@ public class PostfachMailTestFactory {
 	}
 
 	public static String buildSendPostfachMailContent(PostfachMail postfachMail) {
-		return buildSendPostfachMailContent(postfachMail, CommandOrder.SEND_POSTFACH_MAIL);
+		return buildSendPostfachMailContent(postfachMail, CommandOrder.SEND_POSTFACH_NACHRICHT);
 	}
 
 	public static String buildSendPostfachMailContent(PostfachMail postfachMail, CommandOrder order) {