Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 124c0612c8daeba21701095e42877933875fb33a)
+++ kernel/generic/include/ipc/ipc.h	(revision bf75e3cb2c7ba437dce4bc70fc808e165cdb0206)
@@ -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;