diff --git a/assets/img/mailgun-icon.png b/assets/img/mailgun-icon.png
new file mode 100644
index 000000000..41bb27834
Binary files /dev/null and b/assets/img/mailgun-icon.png differ
diff --git a/docs/mailgun.markdown b/docs/mailgun.markdown
new file mode 100644
index 000000000..a1dbe41ba
--- /dev/null
+++ b/docs/mailgun.markdown
@@ -0,0 +1,61 @@
+Mailgun
+=======
+
+You can use the service [Mailgun](http://www.mailgun.com/) to create tasks directly by email.
+
+This integration works with the inbound email service of Mailgun (routes).
+Kanboard use a webhook to handle incoming emails.
+
+Incoming emails workflow
+------------------------
+
+1. You send an email to a specific address, by example **something+myproject@inbound.mydomain.tld**
+2. Your email is forwarded to Mailgun SMTP servers
+3. Mailgun call the Kanboard webhook with the email in JSON format
+4. Kanboard parse the received email and create the task to the right project
+
+Note: New tasks are automatically created in the first column.
+
+Email format
+------------
+
+- The local part of the email address must use the plus separator, by example **kanboard+project123**
+- The string defined after the plus sign must match a project identifier, by example **project123** is the identifier of the project **Project 123**
+- The email subject becomes the task title
+- The email body becomes the task description (Markdown format)
+
+Incoming emails can be written in text or HTML formats.
+**Kanboard is able to convert simple HTML emails to Markdown**.
+
+Security and requirements
+-------------------------
+
+- The Kanboard webhook is protected by a random token
+- The sender email address must match a Kanboard user
+- The Kanboard project must have a unique identifier, by example **MYPROJECT**
+- The Kanboard user must be member of the project
+
+Mailgun configuration
+---------------------
+
+Create a new route in the web interface or via the API ([official documentation](https://documentation.mailgun.com/user_manual.html#routes)), here an example:
+
+```
+match_recipient("^kanboard\+(.*)@mydomain.tld$")
+forward("https://mykanboard/?controller=webhook&action=mailgun&token=mytoken")
+```
+
+The Kanboard webhook url is displayed in **Settings > Integrations > Mailgun**
+
+Kanboard configuration
+----------------------
+
+1. Be sure that your users have an email address in their profiles
+2. Assign a project identifier to the desired projects: **Project settings > Edit**
+3. Try to send an email to your project
+
+Troubleshootings
+----------------
+
+- Test if your route match in the console
+- Double-check requirements mentioned above
diff --git a/docs/postmark.markdown b/docs/postmark.markdown
index 64beeb686..681ec5a22 100644
--- a/docs/postmark.markdown
+++ b/docs/postmark.markdown
@@ -21,7 +21,7 @@ Email format
- The local part of the email address must use the plus separator, by example **kanboard+project123**
- The string defined after the plus sign must match a project identifier, by example **project123** is the identifier of the project **Project 123**
-- The email subject becomes the task subject
+- The email subject becomes the task title
- The email body becomes the task description (Markdown format)
Incoming emails can be written in text or HTML formats.
diff --git a/tests/units/MailgunWebhookTest.php b/tests/units/MailgunWebhookTest.php
new file mode 100644
index 000000000..c27451805
--- /dev/null
+++ b/tests/units/MailgunWebhookTest.php
@@ -0,0 +1,51 @@
+container);
+ $p = new Project($this->container);
+ $pp = new ProjectPermission($this->container);
+ $u = new User($this->container);
+ $tc = new TaskCreation($this->container);
+ $tf = new TaskFinder($this->container);
+
+ $this->assertEquals(2, $u->create(array('name' => 'me', 'email' => 'me@localhost')));
+
+ $this->assertEquals(1, $p->create(array('name' => 'test1')));
+ $this->assertEquals(2, $p->create(array('name' => 'test2', 'identifier' => 'TEST1')));
+
+ // Empty payload
+ $this->assertFalse($w->parsePayload(array()));
+
+ // Unknown user
+ $this->assertFalse($w->parsePayload(array('sender' => 'a@b.c', 'subject' => 'Email task', 'recipient' => 'foobar', 'stripped-text' => 'boo')));
+
+ // Project not found
+ $this->assertFalse($w->parsePayload(array('sender' => 'me@localhost', 'subject' => 'Email task', 'recipient' => 'foo+test@localhost', 'stripped-text' => 'boo')));
+
+ // User is not member
+ $this->assertFalse($w->parsePayload(array('sender' => 'me@localhost', 'subject' => 'Email task', 'recipient' => 'foo+test1@localhost', 'stripped-text' => 'boo')));
+ $this->assertTrue($pp->addMember(2, 2));
+
+ // The task must be created
+ $this->assertTrue($w->parsePayload(array('sender' => 'me@localhost', 'subject' => 'Email task', 'recipient' => 'foo+test1@localhost', 'stripped-text' => 'boo')));
+
+ $task = $tf->getById(1);
+ $this->assertNotEmpty($task);
+ $this->assertEquals(2, $task['project_id']);
+ $this->assertEquals('Email task', $task['title']);
+ $this->assertEquals('boo', $task['description']);
+ $this->assertEquals(2, $task['creator_id']);
+ }
+}
