diff --git a/ChangeLog b/ChangeLog
index d3bd2b0f3..fd4344a64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@
 
 2009-11-24  Francis Lachapelle  <flachapelle@inverse.ca>
 
-	* SoObjects/Mailer/NSData+Mail.m (-decodedString): renamed from
+	* SoObjects/Mailer/NSData+Mail.m (-decodedHeader): renamed from
 	decodedSubject. The decoding algorithm is now recursive.
 
 	* SoObjects/Mailer/NSString+Mail.m (-decodedHeader): renamed from
diff --git a/SoObjects/Mailer/NSData+Mail.h b/SoObjects/Mailer/NSData+Mail.h
index 4aeb7afcc..9c7deb3ba 100644
--- a/SoObjects/Mailer/NSData+Mail.h
+++ b/SoObjects/Mailer/NSData+Mail.h
@@ -30,7 +30,7 @@
 @interface NSData (SOGoMailUtilities)
 
 - (NSData *) bodyDataFromEncoding: (NSString *) encoding;
-- (NSString *) decodedString;
+- (NSString *) decodedHeader;
 
 @end
 
diff --git a/SoObjects/Mailer/NSData+Mail.m b/SoObjects/Mailer/NSData+Mail.m
index c7ece1ab7..6315979b1 100644
--- a/SoObjects/Mailer/NSData+Mail.m
+++ b/SoObjects/Mailer/NSData+Mail.m
@@ -57,7 +57,7 @@
 /*
  * Excpected form is: "=?charset?encoding?encoded text?=".
  */
-- (NSString *) decodedString
+- (NSString *) decodedHeader
 {
   const char *cData;
   unsigned int len, i, j;
@@ -140,7 +140,7 @@
 		      // Recursively decode the remaining part
 		      decodedString = [NSString stringWithFormat: @"%@%@",
 						decodedString,
-					 [[self subdataWithRange: NSMakeRange(j, len-j)] decodedString]];
+					 [[self subdataWithRange: NSMakeRange(j, len-j)] decodedHeader]];
 		    }
 		}
 	      else
diff --git a/SoObjects/Mailer/NSString+Mail.m b/SoObjects/Mailer/NSString+Mail.m
index 14b53e6f7..3d9244965 100644
--- a/SoObjects/Mailer/NSString+Mail.m
+++ b/SoObjects/Mailer/NSString+Mail.m
@@ -443,7 +443,7 @@ convertChars (const char *oldString, unsigned int oldLength,
   NSString *decodedHeader;
 
   decodedHeader = [[self dataUsingEncoding: NSASCIIStringEncoding]
-		     decodedString];
+		     decodedHeader];
   if (!decodedHeader)
     decodedHeader = self;
   
diff --git a/UI/MailPartViewers/UIxMailPartMessageViewer.m b/UI/MailPartViewers/UIxMailPartMessageViewer.m
index bead9d0da..0fd3a7c90 100644
--- a/UI/MailPartViewers/UIxMailPartMessageViewer.m
+++ b/UI/MailPartViewers/UIxMailPartMessageViewer.m
@@ -162,7 +162,7 @@
   // -stringByDecodingQuotedPrintable for all details
   if ([baseSubject isKindOfClass: [NSString class]])
     baseSubject = [baseSubject dataUsingEncoding: NSASCIIStringEncoding];
-  subject = [baseSubject decodedString];
+  subject = [baseSubject decodedHeader];
 
   if (![subject length])
     subject = [self labelForKey: @"Untitled"];