Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 8c9b7420aefd05536d4db8cc068e4a4bbf103ac9)
+++ kernel/generic/include/ipc/ipc.h	(revision 8526e5851735f721474fd66288fa0bd2ee19ad96)
@@ -321,8 +321,8 @@
 typedef struct {
 	sysarg_t args[IPC_CALL_LEN];
+	/** Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME. */
+	struct task *task;
 	/** Phone which made or last masqueraded this call. */
 	phone_t *phone;
-	/** Last task to perform _ipc_call(). */
-	struct task *task;
 } ipc_data_t;