Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision eb5560afe8035cebc052dbeff42312cbf2312d2f)
+++ kernel/generic/include/ipc/ipc.h	(revision fcfa926b2317b908a3f89771e91374c54f076261)
@@ -141,4 +141,7 @@
 	struct task *sender;
 	
+	/** Phone which was used to send the call. */
+	phone_t *caller_phone;
+	
 	/** Private data to internal IPC. */
 	sysarg_t priv;
@@ -152,11 +155,4 @@
 	/** Buffer for IPC_M_DATA_WRITE and IPC_M_DATA_READ. */
 	uint8_t *buffer;
-	
-	/*
-	 * The forward operation can masquerade the caller phone. For those
-	 * cases, we must keep it aside so that the answer is processed
-	 * correctly.
-	 */
-	phone_t *caller_phone;
 } call_t;