diff --git a/src/Makefile b/src/Makefile
index 0ca86bd..d9faaeb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,9 +15,14 @@ org_pEp_jniadapter_AbstractEngine.h: org/pEp/jniadapter/AbstractEngine.java
 org_pEp_jniadapter_Engine.h: org/pEp/jniadapter/Engine.java
 	javah org.pEp.jniadapter.Engine
 
+org_pEp_jniadapter_MimeMessage.h: org/pEp/jniadapter/MimeMessage.java
+	javah org.pEp.jniadapter.MimeMessage
+
 org_pEp_jniadapter_AbstractEngine.o: org_pEp_jniadapter_AbstractEngine.h org_pEp_jniadapter_AbstractEngine.cc throw_pEp_exception.hh jniutils.hh
 
-$(LIBRARY): org_pEp_jniadapter_AbstractEngine.o throw_pEp_exception.o jniutils.o
+%.o: %.cc %.h jniutils.hh
+
+$(LIBRARY): org_pEp_jniadapter_AbstractEngine.o org_pEp_jniadapter_Engine.o org_pEp_jniadapter_MimeMessage.o throw_pEp_exception.o jniutils.o
 	ar -r $@ *.o
 
 org/pEp/jniadapter/pEpException.java: pEp.yml2 gen_java_exceptions.ysl2
diff --git a/src/Makefile.conf b/src/Makefile.conf
index 3ba32a3..c235ca1 100644
--- a/src/Makefile.conf
+++ b/src/Makefile.conf
@@ -1,3 +1,3 @@
 JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_11.jdk/Contents/Home
 CXXFLAGS=-I$(JAVA_HOME)/include -I/opt/local/include -I$(JAVA_HOME)/include/darwin -I$(HOME)/include
-CLASSPATH=$(HOME)/k-9/src
+CLASSPATH=.:$(HOME)/k-9/src
diff --git a/src/gen_java_Message.ysl2 b/src/gen_java_Message.ysl2
index beb5f71..fc3a2c2 100644
--- a/src/gen_java_Message.ysl2
+++ b/src/gen_java_Message.ysl2
@@ -55,8 +55,9 @@ public class MimeMessage {
 
     template "entry"
         ||
-        public native †@type «@name»();
-        public native void «@name»(†@type value);
+        public native †@type ©@name();
+        public native void ©@name(†@type value);
+
         ||
 }
 
diff --git a/src/pEp.yml2 b/src/pEp.yml2
index 9c2966d..9d2ca41 100644
--- a/src/pEp.yml2
+++ b/src/pEp.yml2
@@ -1,6 +1,7 @@
 decl namespace @name;
 decl enum @name;
 decl interface @name;
+decl exception @name;
 decl method @name;
 decl struct @name;
 decl entry @type @name;
diff --git a/src/textutils.ysl2 b/src/textutils.ysl2
index ded3427..08121af 100644
--- a/src/textutils.ysl2
+++ b/src/textutils.ysl2
@@ -25,3 +25,5 @@ function "CamelCase" {
     }
 }
 
+define operator "©([$@]?[a-zA-Z0-9_]+)" as call "CamelCase" with "text", "%1";
+