@@ -1060,10 +1060,16 @@
 	OFMutableString *serialization = [[self mutableCopy] autorelease];
 	[serialization replaceOccurrencesOfString: @"\\"
 				       withString: @"\\\\"];
 	[serialization replaceOccurrencesOfString: @"\""
 				       withString: @"\\\""];
+	[serialization replaceOccurrencesOfString: @"\n"
+				       withString: @"\\n\"\n    \""];
+	[serialization replaceOccurrencesOfString: @"\r"
+				       withString: @"\\r"];
+	[serialization replaceOccurrencesOfString: @"\t"
+				       withString: @"\\t"];
 
 	if ([self isKindOfClass: [OFMutableString class]])
 		[serialization prependString: @"<mutable>\""];
 	else
 		[serialization prependString: @"\""];