diff --git a/ChangeLog b/ChangeLog
index e1dc42a6c..0eeea2b02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-06-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+	(-childPartName): fixed a potential crash by building the NSString
+	from the integer itself, with the proper format string.
+
 	* SoObjects/SOGo/NSString+Crypto.m
 	(-isEqualToCrypted:withDefaultScheme:): invoke "intValue" rather
 	than "integerValue" on the encoding number as the int type is not
diff --git a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
index 16e15d24d..65d30b76a 100644
--- a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+++ b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
@@ -174,11 +174,8 @@
 
 - (NSString *) childPartName
 {
-  char buf[8];
-
-  sprintf (buf, "%"PRIuPTR"", [self childIndex] + 1);
-
-  return [NSString stringWithCString:buf];
+  return [NSString stringWithFormat: @"%u",
+                   (unsigned int) ([self childIndex] + 1)];
 }
 
 - (id) childPartPath