diff --git a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
index 5e0e34d417b68f2b303bf27c86a3b80293c8c65b..89f83f8c59814a24ec81ee63bc093c34d7034f54 100644
--- a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
+++ b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/rich-test/data-set-handler.py
@@ -15,7 +15,7 @@ def sendMail(context, subject, message):
 
 def post_metadata_registration(context):
     content = "post_metadata_registration rich %s " % context.getPersistentMap().get("email_text")
-    sendMail(context, "Subject", "post_metadata_registration rich")
+    sendMail(context, "Subject", content)
 
 def create_space_if_needed(transaction):
     space = transaction.getSpace(SPACE_CODE)
@@ -63,4 +63,4 @@ def process(transaction):
     # register samples
     createSamples(transaction)
 
-    transaction.getRegistrationContext.getPersistentMap().put("email_text", "rich_email_text")
+    transaction.getRegistrationContext().getPersistentMap().put("email_text", "rich_email_text")
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
index 8aa5a8cc7e24259c4d0e85896729f8496a3b01c7..123e7afb4e6e1bca0cefccec9bd9a93cc2a4b548 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
@@ -48,7 +48,7 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
         return new File(rootDir, "incoming-rich-test");
     }
 
-    @Test(groups = "broken")
+    @Test
     public void testRichImport() throws Exception
     {
 
@@ -79,7 +79,8 @@ public class FeatureRichDataSetImportSystemTest extends SystemTestCase
             String content = FileUtilities.loadExactToString(f);
             if (content.contains("post_metadata_registration rich"))
             {
-                assertTrue(content.contains("rich_email_text")); // check the content introduced
+                assertTrue(content, content.contains("rich_email_text")); // check the content
+                                                                          // introduced
                                                                  // with the persistent map
                 return; // assert ok
             }