@@ -36,6 +36,11 @@
  * You MAY use the {@link ReceiverAction.Extra} annotation on parameters to
  * define a different extra name.
  * </p>
+ * <p>
+ * Parameters of type {@link android.content.Intent} or
+ * {@link android.content.Context} will get the corresponding parameter of
+ * {@code void onReceive(Context context, Intent intent)} assigned.
+ * </p>
  * <blockquote>
  * 
  * Example :
 
@@ -106,6 +106,15 @@ private void addActionInOnReceive(EReceiverHolder holder, ExecutableElement exec
 			// Extras params
 			for (VariableElement param : methodParameters) {
 				String paramName = param.getSimpleName().toString();
+				JClass extraParamClass = codeModelHelper.typeMirrorToJClass(param.asType(), holder);
+
+				if (extraParamClass.equals(classes().CONTEXT)) {
+					callActionInvocation.arg(holder.getOnReceiveContext());
+					continue;
+				} else if (extraParamClass.equals(classes().INTENT)) {
+					callActionInvocation.arg(holder.getOnReceiveIntent());
+					continue;
+				}
 
 				Extra annotation = param.getAnnotation(ReceiverAction.Extra.class);
 				if (annotation != null && !annotation.value().isEmpty()) {
@@ -114,7 +123,6 @@ private void addActionInOnReceive(EReceiverHolder holder, ExecutableElement exec
 
 				String extraParamName = paramName.replaceAll("\\.", "_") + "_Extra";
 				JFieldVar paramVar = getStaticExtraField(holder, paramName);
-				JClass extraParamClass = codeModelHelper.typeMirrorToJClass(param.asType(), holder);
 				BundleHelper bundleHelper = new BundleHelper(annotationHelper, param);
 
 				JExpression getExtraExpression = JExpr.invoke(extras, bundleHelper.getMethodNameToRestore()).arg(paramVar);
 
@@ -35,6 +35,7 @@ public class EReceiverHolder extends EComponentHolder {
 	private JBlock onReceiveBody;
 	private JVar onReceiveIntentAction;
 	private JVar onReceiveIntent;
+	private JVar onReceiveContext;
 	private JMethod onReceiveMethod;
 
 	public EReceiverHolder(ProcessHolder processHolder, TypeElement annotatedElement) throws Exception {
@@ -57,13 +58,13 @@ protected void setInit() {
 
 	private void createOnReceive() {
 		onReceiveMethod = generatedClass.method(PUBLIC, codeModel().VOID, "onReceive");
-		JVar contextParam = onReceiveMethod.param(classes().CONTEXT, "context");
+		onReceiveContext = onReceiveMethod.param(classes().CONTEXT, "context");
 		onReceiveIntent = onReceiveMethod.param(classes().INTENT, "intent");
 		onReceiveMethod.annotate(Override.class);
 		onReceiveBody = onReceiveMethod.body();
-		onReceiveBody.assign(getContextField(), contextParam);
+		onReceiveBody.assign(getContextField(), onReceiveContext);
 		onReceiveBody.invoke(getInit());
-		onReceiveBody.invoke(JExpr._super(), onReceiveMethod).arg(contextParam).arg(onReceiveIntent);
+		onReceiveBody.invoke(JExpr._super(), onReceiveMethod).arg(onReceiveContext).arg(onReceiveIntent);
 
 		JInvocation getActionInvocation = JExpr.invoke(onReceiveIntent, "getAction");
 		onReceiveIntentAction = onReceiveBody.decl(classes().STRING, "action", getActionInvocation);
@@ -90,6 +91,13 @@ public JVar getOnReceiveIntent() {
 		return onReceiveIntent;
 	}
 
+	public JVar getOnReceiveContext() {
+		if (onReceiveContext == null) {
+			createOnReceive();
+		}
+		return onReceiveContext;
+	}
+
 	public JVar getOnReceiveIntentAction() {
 		if (onReceiveIntentAction == null) {
 			createOnReceive();