diff --git a/src/de/mrbesen/telegram/TelegramAPI.java b/src/de/mrbesen/telegram/TelegramAPI.java
index 83ce049..c8f4fb9 100644
--- a/src/de/mrbesen/telegram/TelegramAPI.java
+++ b/src/de/mrbesen/telegram/TelegramAPI.java
@@ -294,7 +294,8 @@ public class TelegramAPI implements Runnable {
 				JSONObject cbq = json.getJSONObject("callback_query");
 				TUser from = api.getUser(cbq.getJSONObject("from"));
 				String data = cbq.getString("data");
-				getEventManager().callEvent(new UserCallbackEvent(from, data));
+				TMessage msg = new TMessage(cbq.getJSONObject("message"), api);
+				getEventManager().callEvent(new UserCallbackEvent(from, data, msg));
 			}
 		}
 
diff --git a/src/de/mrbesen/telegram/event/events/UserCallbackEvent.java b/src/de/mrbesen/telegram/event/events/UserCallbackEvent.java
index ecc2326..a6decae 100644
--- a/src/de/mrbesen/telegram/event/events/UserCallbackEvent.java
+++ b/src/de/mrbesen/telegram/event/events/UserCallbackEvent.java
@@ -3,15 +3,22 @@ package de.mrbesen.telegram.event.events;
 import org.json.JSONObject;
 
 import de.mrbesen.telegram.event.Event;
+import de.mrbesen.telegram.objects.TMessage;
 import de.mrbesen.telegram.objects.TUser;
 
 public class UserCallbackEvent extends Event {
 
 	private final String data;
+	private final TMessage msg;
 	
-	public UserCallbackEvent(TUser u, String data) {
+	public UserCallbackEvent(TUser u, String data, TMessage msg) {
 		super(u);
 		this.data = data;
+		this.msg = msg;
+	}
+
+	public TMessage getMsg() {
+		return msg;
 	}
 
 	public String getData() {