diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp
index 3b19a53b..f18a5e8d 100644
--- a/libkmime/kmime_util.cpp
+++ b/libkmime/kmime_util.cpp
@@ -436,29 +436,25 @@ TQCString LFtoCRLF(const TQCString &s)
 
 void removeQuots(TQCString &str)
 {
-  str.replace(TQRegExp("\\\""), "\"");
-  str.replace(TQRegExp("\\\\"), "\\");
+  // Removes any quote or backslash caracter
+  str.replace(TQRegExp("[\\\"]"), "");
 }
 
 
 void removeQuots(TQString &str)
 {
-  str.replace(TQRegExp("\\\""), "\"");
-  str.replace(TQRegExp("\\\\"), "\\");
+  // Removes any quote or backslash caracter
+  str.replace(TQRegExp("[\\\"]"), "");
 }
 
 
 void addQuotes(TQCString &str, bool forceQuotes)
 {
-  bool needsQuotes=false;
-  if ( TQString( str ) .contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) )
-    needsQuotes = true;
-
-  str.replace(TQRegExp("\\"), "\\\\");
-  str.replace(TQRegExp("\""), "\\\"");
-
-  if (needsQuotes || forceQuotes) {
-    str.insert(0,'\"');
+  if ( forceQuotes || TQString(str).contains( TQRegExp( TQString( "\"|\\\\|=|\\]|\\[|:|;|,|\\.|,|@|<|>|\\)|\\(" ) ) ) ) {
+    // Adds a backslash in front of any existing quote or backslash caracter
+    str.replace(TQRegExp("([\\\"])"), "\\\\1");
+    // Adds quote at beginning and end of thestring
+    str.insert(0,'"');
     str.append("\"");
   }
 }