diff --git a/ChangeLog b/ChangeLog
index ed2a6bd67..01b581ad8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-11-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
+	([UIxMailPartHTMLViewer -_attachmentIds]): the reference was one
+	character too short, which cause the images not to be displayed
+	sometimes and crashes to happen whenever the references on a
+	message were wrong (due to bugs in SOPE).
+
 	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
 	-hasMessageAttachment]): consider an attachment any content that
 	has a non-nil disposition.
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 4dbda7c49..fbe39301f 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -449,7 +449,7 @@
       url = [NSMutableString new];
       [url appendString: baseURL];
       [url appendFormat: @"/%@", [partPath componentsJoinedByString: @"/"]];
-      [url deleteCharactersInRange: NSMakeRange([url length] - 3, 2)];
+      [url deleteCharactersInRange: NSMakeRange([url length] - 2, 2)];
       parts = [[parent bodyInfo] objectForKey: @"parts"];
       max = [parts count];
       for (count = 0; count < max; count++)