### Eclipse Workspace Patch 1.0
#P jverein
diff --git .classpath .classpath
index bab22ef..b9f1ad8 100644
--- .classpath
+++ .classpath
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="junit/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/jameica"/>
-	<classpathentry kind="lib" path="lib/nc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javax.mail-1.5.6.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/hibiscus"/>
-	<classpathentry kind="lib" path="lib/activation.jar"/>
-	<classpathentry kind="lib" path="/Users/heiner/git/hibiscus/lib/obantoo-bin-2.1.12.jar" sourcepath="/hibiscus/lib.src/hbci4java-2.5.12-src.zip"/>
-	<classpathentry kind="lib" path="lib/bsh-core-2.0b4.jar"/>
-	<classpathentry kind="lib" path="/hibiscus/lib/itextpdf-5.3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/csvjdbc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/itext-hyph-xml.jar"/>
-	<classpathentry kind="lib" path="lib/jollyday-0.4.7.jar"/>
-	<classpathentry kind="lib" path="lib/joda-time-2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.13.jar"/>
-	<classpathentry kind="lib" path="/jameica/lib/swt/win64/swt.jar" sourcepath="/jameica/lib.src/swt/linux/swt.src.zip"/>
-	<classpathentry kind="lib" path="lib/junit-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/ez-vcard-0.9.5.jar"/>
-	<classpathentry kind="lib" path="lib/javase-3.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/core-3.1.0.jar"/>
-	<classpathentry kind="lib" path="/jameica/lib/de_willuhn_ds/de_willuhn_ds.jar"/>
-	<classpathentry kind="lib" path="lib/commons-validator-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/hibiscus/lib/super-csv-2.4.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="junit/src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="/jameica"/>
+	<classpathentry kind="lib" path="lib/nc.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javax.mail-1.5.6.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/hibiscus"/>
+	<classpathentry kind="lib" path="lib/activation.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Carsten/git/hibiscus/lib/obantoo-bin-2.1.12.jar" sourcepath="/hibiscus/lib.src/hbci4java-2.5.12-src.zip"/>
+	<classpathentry kind="lib" path="lib/bsh-core-2.0b4.jar"/>
+	<classpathentry kind="lib" path="/hibiscus/lib/itextpdf-5.3.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/csvjdbc.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/itext-hyph-xml.jar"/>
+	<classpathentry kind="lib" path="lib/jollyday-0.4.7.jar"/>
+	<classpathentry kind="lib" path="lib/joda-time-2.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.13.jar"/>
+	<classpathentry kind="lib" path="/jameica/lib/swt/win64/swt.jar" sourcepath="/jameica/lib.src/swt/linux/swt.src.zip"/>
+	<classpathentry kind="lib" path="lib/junit-4.8.1.jar"/>
+	<classpathentry kind="lib" path="lib/ez-vcard-0.9.5.jar"/>
+	<classpathentry kind="lib" path="lib/javase-3.1.0.jar"/>
+	<classpathentry kind="lib" path="lib/core-3.1.0.jar"/>
+	<classpathentry kind="lib" path="/jameica/lib/de_willuhn_ds/de_willuhn_ds.jar"/>
+	<classpathentry kind="lib" path="lib/commons-validator-1.5.1.jar"/>
+	<classpathentry kind="lib" path="/hibiscus/lib/super-csv-2.4.0.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git src/de/jost_net/JVerein/gui/control/MailControl.java src/de/jost_net/JVerein/gui/control/MailControl.java
index b7929fd..60d9bc6 100644
--- src/de/jost_net/JVerein/gui/control/MailControl.java
+++ src/de/jost_net/JVerein/gui/control/MailControl.java
@@ -415,9 +415,21 @@
    */
   private void sendeMail(final boolean erneutSenden) throws RemoteException
   {
+    String text = getTxtString();
+    if (text.toLowerCase().contains("<html") && text.toLowerCase().contains("</body")) 
+    {
+    	// MailSignatur ohne Separator mit vorangestellten hr in den body einbauen
+   		text = text.substring(0, text.toLowerCase().indexOf("</body")-1);
+       	text = text + "<hr />" + Einstellungen.getEinstellung().getMailSignatur(false);
+       	text = text + "</body></html>";
+    }
+    else
+    {	
+    	// MailSignatur mit Separator einfach anh�ngen
+    	text = text + Einstellungen.getEinstellung().getMailSignatur(true);
+    }
+    final String txt = text;
     final String betr = getBetreffString();
-    final String txt = getTxtString()
-        + Einstellungen.getEinstellung().getMailSignatur(true);
     BackgroundTask t = new BackgroundTask()
     {