diff --git a/src/main/java/de/mrbesen/telegram/MessageBuilder.java b/src/main/java/de/mrbesen/telegram/MessageBuilder.java
index b75bf4a..bafd375 100644
--- a/src/main/java/de/mrbesen/telegram/MessageBuilder.java
+++ b/src/main/java/de/mrbesen/telegram/MessageBuilder.java
@@ -233,8 +233,8 @@ public class MessageBuilder {
 	@Getter
 	@AllArgsConstructor
 	class SendableMessage {
-		private final String q;
 		private final String command;
+		private final String q;
 		private final long userid;
 	}
 	
diff --git a/src/main/java/de/mrbesen/telegram/TelegramAPI.java b/src/main/java/de/mrbesen/telegram/TelegramAPI.java
index a4d6f50..0b98f17 100644
--- a/src/main/java/de/mrbesen/telegram/TelegramAPI.java
+++ b/src/main/java/de/mrbesen/telegram/TelegramAPI.java
@@ -572,7 +572,7 @@ public class TelegramAPI implements Runnable {
 
 				String text = msg.getText();
 				if(text != null) {
-					if(text.matches("^\\/(\\w*)(@(\\w*))?")) {
+					if(text.matches("^\\/(\\w*)(@(\\w*))?")) { //is a command
 						text = text.substring(1);//remove '/'
 						isCommand = true;
 						if(text.contains("@")) {//check name
@@ -589,39 +589,42 @@ public class TelegramAPI implements Runnable {
 							cmdmgr.onCommand(text, msg.getFrom(), msg);
 						}
 					} else {
-						Event e = null;
-						if(msg.has(Member.audio)) {
-							e = new UserSendAudioEvent(msg);
-						} else if(msg.has(Member.video)) {
-
-						} else if(msg.has(Member.document)) {
-							e = new UserSendDocumentEvent(msg);
-						} else if(msg.has(Member.photo)) {
-							e = new UserSendPhotoEvent(msg);
-						} else if(msg.has(Member.invoice)) {
-
-						} else if(msg.has(Member.location)) {
-
-						} else if(msg.has(Member.video_note)) {
-
-						} else if(msg.has(Member.game)) {
-
-						} else if(msg.has(Member.contact)) {
-
-						} else if(msg.has(Member.sticker)) {
-
-						} else {
-							e = new UserSendMessageEvent(msg);
-							//call feedback cmd first
-							if(!disableFeedback) {
-								if (feedbackCmd.onMsg((UserSendMessageEvent) e)) {
-									e = null;
-								}
+						Event e = new UserSendMessageEvent(msg);
+						//call feedback cmd first
+						if(!disableFeedback) {
+							if (feedbackCmd.onMsg((UserSendMessageEvent) e)) {
+								e = null;
 							}
 						}
 						getEventManager().callEvent(e);
+						return; //do not process other events
 					}
 				}
+
+				Event e = null;
+				//process media events
+				if(msg.has(Member.audio)) {
+					e = new UserSendAudioEvent(msg);
+				} else if(msg.has(Member.video)) {
+					//TODO
+				} else if(msg.has(Member.document)) {
+					e = new UserSendDocumentEvent(msg);
+				} else if(msg.has(Member.photo)) {
+					e = new UserSendPhotoEvent(msg);
+				} else if(msg.has(Member.invoice)) {
+					//TODO
+				} else if(msg.has(Member.location)) {
+					//TODO
+				} else if(msg.has(Member.video_note)) {
+					//TODO
+				} else if(msg.has(Member.game)) {
+					//TODO
+				} else if(msg.has(Member.contact)) {
+					//TODO
+				} else if(msg.has(Member.sticker)) {
+					//TODO
+				}
+				getEventManager().callEvent(e);
 			} else if(json.has("callback_query")) {
 				JSONObject cbq = json.getJSONObject("callback_query");
 				TUser from = api.getUser(cbq.getJSONObject("from"));