diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 159c450..a93f90f 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,5 +1,7 @@
+2010-11-30 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Minor fix in RFC 2047 text handling
 2010-11-29 P. A. Bagyenda <bagyenda@dsmagic.com>
-	* Add better handling of character sets in mms fields
+	* Add better handling of character sets in mms fields (RFC 2047)
 2010-11-26 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Minor fix for default log level (thanks to Piotr Isajew (pki at ex.com.pl)
 2010-11-23 P. A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 793f3a1..ddee217 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -2413,7 +2413,7 @@ static Octstr *parse_rfc2047_atom(Octstr *in, int offset, int *mibenum, int *end
      if ((n = octstr_search_char(xs, '?', 0)) >= 0) {
 	  enc = octstr_get_char(xs, n-1);
 	  octstr_delete(xs, 0, 2); /* Delete the encoding, and the following '?' */
-	  offset += n+2;	  
+	  offset += n+1;	  
      } else 
 	  enc = 'q';