diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java
index 3665dcfd4d9e1abd8cdc9750aa3404f5c958ab76..b60ddb942c7a156df5ccd4b400ad8733c44b980c 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java
@@ -29,7 +29,7 @@ import org.apache.commons.mail.SimpleEmail;
  * @author Joram Barrez
  * @author Frederik Heremans
  */
-public class MailActivityBehavior implements ActivityBehavior {
+public class MailActivityBehavior extends FlowNodeActivityBehavior {
 
   private Expression to;
   private Expression from;
@@ -62,6 +62,7 @@ public class MailActivityBehavior implements ActivityBehavior {
     } catch (EmailException e) {
       throw new ActivitiException("Could not send e-mail", e);
     }
+    leave(execution);
   }
 
   protected Email createEmail(String text, String html) {
diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java
index 147ace896ddb53faedfa25958dc3bc6ee7d9d6ae..83ea43e65ec5e85f69c3d6dff0321c2de666f80a 100644
--- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java
+++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.java
@@ -56,7 +56,7 @@ public class EmailServiceTaskTest extends PluggableActivitiTestCase {
   
   @Deployment
   public void testSimpleTextMail() throws Exception {
-    runtimeService.startProcessInstanceByKey("simpleTextOnly");
+    String procId = runtimeService.startProcessInstanceByKey("simpleTextOnly").getId();
     
     List<WiserMessage> messages = wiser.getMessages();
     assertEquals(1, messages.size());
@@ -64,6 +64,7 @@ public class EmailServiceTaskTest extends PluggableActivitiTestCase {
     WiserMessage message = messages.get(0);
     assertEmailSend(message, false, "Hello Kermit!", "This a text only e-mail.", "activiti@localhost",
             Arrays.asList("kermit@activiti.org"), null);
+    assertProcessEnded(procId);
   }
   
   @Deployment