1 files changed, 6 insertions, 5 deletions

diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index 9263c3a..592d116 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1100,21 +1100,22 @@ static void writeEncString(OFile *fp, const char *s, bool nosemi)
         case Base64:
             writeBase64(fp, (unsigned char*)p, strlen(p));
             break;
     }
 }
 
-static bool includesUnprintable(VObject *o)
+static bool includesUnprintable(VObject *o, bool nosemi)
 {
     if (o) {
         if (VALUE_TYPE(o) == VCVT_STRINGZ) {
             const char *p = STRINGZ_VALUE_OF(o);
             if (p) {
                 while (*p) {
                     if (*p==' ' && (!p[1] || p[1]=='\n') // RFC 1521: spaces at ends need quoting
-                             || qpReplaceChar(*p) )
+                            || qpReplaceChar(*p)
+                            || *p==';' && nosemi )
                         return TRUE;
                     p++;
                 }
             }
         }
     }
@@ -1158,13 +1159,13 @@ static void writeValue(OFile *fp, VObject *o, unsigned long size, bool nosemi)
 static void writeAttrValue(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
         struct PreDefProp *pi;
         pi = lookupPropInfo(NAME_OF(o));
         if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;
-        if ( includesUnprintable(o) )
+        if ( includesUnprintable(o,TRUE) )
             appendsOFileEncCs(fp);
         appendcOFile(fp,';');
         appendsOFile(fp,NAME_OF(o));
     } else {
         appendcOFile(fp,';');
     }
@@ -1226,13 +1227,13 @@ static void writeProp(OFile *fp, VObject *o)
             int i = 0, n = 0;
             const char** fields = fields_;
             /* output prop as fields */
             bool printable = TRUE;
             while (*fields && printable) {
                 VObject *t = isAPropertyOf(o,*fields);
-                if (includesUnprintable(t))
+                if (includesUnprintable(t,TRUE))
                     printable = FALSE;
                 fields++;
             }
             fields = fields_;
             if (!printable)
                 appendsOFileEncCs(fp);
@@ -1251,13 +1252,13 @@ static void writeProp(OFile *fp, VObject *o)
             }
             }
         }
 
         
     if (VALUE_TYPE(o)) {
-            if ( includesUnprintable(o) )
+            if ( includesUnprintable(o,FALSE) )
                         appendsOFileEncCs(fp);
         unsigned long size = 0;
         VObject *p = isAPropertyOf(o,VCDataSizeProp);
         if (p) size = LONG_VALUE_OF(p);
         appendcOFile(fp,':');
         writeValue(fp,o,size,FALSE);