--- a/src/com/beem/project/beem/service/aidl/IChat.aidl	Tue May 14 18:24:25 2013 +0200
+++ b/src/com/beem/project/beem/service/aidl/IChat.aidl	Fri Dec 26 15:43:38 2014 +0100
@@ -56,7 +56,7 @@
     	 * Send a message.
     	 * @param message	the message to send
     	 */
-	void sendMessage(in Message message);
+	void sendMessage(in com.beem.project.beem.service.Message message);
 
 	/**
 	 * Get the participant of the chat
@@ -86,7 +86,7 @@
 
 	void setState(in String state);
 
-	List<Message> getMessages();
+	List<com.beem.project.beem.service.Message> getMessages();
 
 	/**
 	 * Try to start an OTR session.

--- a/src/com/beem/project/beem/service/aidl/IMessageListener.aidl	Tue May 14 18:24:25 2013 +0200
+++ b/src/com/beem/project/beem/service/aidl/IMessageListener.aidl	Fri Dec 26 15:43:38 2014 +0100
@@ -53,7 +53,7 @@
 	 * @param chat the chat receiving the message.
 	 * @param msg the message received in the chat.
 	 */
-	void processMessage(in IChat chat, in Message msg);
+	void processMessage(in IChat chat, in com.beem.project.beem.service.Message msg);
 
 	/**
 	 * This method is executed when a new ChatState is received by the chat.