diff --git a/UI/Contacts/UIxContactsListView.m b/UI/Contacts/UIxContactsListView.m
index 3a39c4f35..f48429ac0 100644
--- a/UI/Contacts/UIxContactsListView.m
+++ b/UI/Contacts/UIxContactsListView.m
@@ -231,7 +231,7 @@
 {
   WORequest *request;
   WOResponse *response;
-  NSData *data;
+  id data;
   NSMutableDictionary *rc;
   NSString *fileContent;
   int imported = 0;
@@ -239,10 +239,15 @@
 
   request = [context request];
   rc = [NSMutableDictionary dictionary];
-  data = (NSData *)[request formValueForKey: @"contactsFile"];
-  fileContent = [[NSString alloc] initWithData: data 
-                                      encoding: NSUTF8StringEncoding];
-  [fileContent autorelease];
+  data = [request formValueForKey: @"contactsFile"];
+  if ([data respondsToSelector: @selector(isEqualToString:)])
+    fileContent = (NSString *) data;
+  else
+    {
+      fileContent = [[NSString alloc] initWithData: (NSData *) data 
+                                          encoding: NSUTF8StringEncoding];
+      [fileContent autorelease];
+    }
 
   if (fileContent && [fileContent length])
     {
@@ -265,6 +270,8 @@
            forKey: @"message"];
 
   response = [self responseWithStatus: 200];
+  [response setHeader: @"text/html" 
+               forKey: @"content-type"];
   [(WOResponse*)response appendContentString: [rc jsonRepresentation]];
 
   return response;
diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index 88f480c37..3bd897522 100644
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -707,7 +707,7 @@ static BOOL shouldDisplayWeekend = NO;
   WORequest *request;
   WOResponse *response;
   NSString *fileContent;
-  NSData *data;
+  id data;
   iCalCalendar *additions;
   int i, count, imported;
 
@@ -715,9 +715,15 @@ static BOOL shouldDisplayWeekend = NO;
   rc = [NSMutableDictionary dictionary];
   request = [context request];
   folder = [self clientObject];
-  data = (NSData *)[request formValueForKey: @"calendarFile"];
-  fileContent = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
-  [fileContent autorelease];
+  data = [request formValueForKey: @"calendarFile"];
+  if ([data respondsToSelector: @selector(isEqualToString:)])
+    fileContent = (NSString *) data;
+  else
+    {
+      fileContent = [[NSString alloc] initWithData: (NSData *) data 
+                                          encoding: NSUTF8StringEncoding];
+      [fileContent autorelease];
+    }
 
   if (fileContent && [fileContent length] 
       && [fileContent hasPrefix: @"BEGIN:"])
@@ -759,6 +765,8 @@ static BOOL shouldDisplayWeekend = NO;
                 forKey: @"message"];
 
   response = [self responseWithStatus: 200];
+  [response setHeader: @"text/html" 
+               forKey: @"content-type"];
   [(WOResponse*)response appendContentString: [rc jsonRepresentation]];
   return response;
 }
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 47ed21292..375f4d670 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -690,8 +690,6 @@ function validateUploadForm () {
     return rc;
 }
 function uploadCompleted (response) {
-    response = response.replace (/<pre>/, "");
-    response = response.replace (/<\/pre>/, "");
     data = response.evalJSON (true);
 
     var div = $("uploadResults");
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 8639726d6..5abd1ba72 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1924,8 +1924,6 @@ function validateUploadForm () {
     return rc;
 }
 function uploadCompleted (response) {
-    response = response.replace (/<pre>/, "");
-    response = response.replace (/<\/pre>/, "");
     data = response.evalJSON (true);
 
     var div = $("uploadResults");