-void _mutt_make_string (char *, size_t, const char *, CONTEXT *,
- HEADER *, format_flag);
-
-int mutt_extract_token (BUFFER *, BUFFER *, int);
-BUFFER * mutt_buffer_init (BUFFER *);
-BUFFER * mutt_buffer_from (BUFFER *, char *);
-void mutt_buffer_free(BUFFER **);
-void mutt_buffer_add (BUFFER*, const char*, size_t);
-void mutt_buffer_addstr (BUFFER*, const char*);
-void mutt_buffer_addch (BUFFER*, char);
-
-#define mutt_system(x) _mutt_system(x,0)
-int _mutt_system (const char *, int);
-
-#define mutt_next_thread(x) _mutt_aside_thread(x,1,0)
-#define mutt_previous_thread(x) _mutt_aside_thread(x,0,0)
-#define mutt_next_subthread(x) _mutt_aside_thread(x,1,1)
-#define mutt_previous_subthread(x) _mutt_aside_thread(x,0,1)
-int _mutt_aside_thread (HEADER *, short, short);
-
-#define mutt_collapse_thread(x,y) _mutt_traverse_thread (x,y,M_THREAD_COLLAPSE)
-#define mutt_uncollapse_thread(x,y) _mutt_traverse_thread (x,y,M_THREAD_UNCOLLAPSE)
-#define mutt_get_hidden(x,y)_mutt_traverse_thread (x,y,M_THREAD_GET_HIDDEN)
-#define mutt_thread_contains_unread(x,y) _mutt_traverse_thread (x,y,M_THREAD_UNREAD)
-#define mutt_thread_next_unread(x,y) _mutt_traverse_thread(x,y,M_THREAD_NEXT_UNREAD)
-int _mutt_traverse_thread (CONTEXT *ctx, HEADER *hdr, int flag);
-
-
-#define mutt_new_parameter() safe_calloc (1, sizeof (PARAMETER))
-#define mutt_new_header() safe_calloc (1, sizeof (HEADER))
-#define mutt_new_envelope() safe_calloc (1, sizeof (ENVELOPE))
-#define mutt_new_enter_state() safe_calloc (1, sizeof (ENTER_STATE))
-
-typedef const char * format_t (char *, size_t, char, const char *, const char *, const char *, const char *, unsigned long, format_flag);
-
-void mutt_FormatString (char *, size_t, const char *, format_t *, unsigned long, format_flag);
-void mutt_parse_content_type (char *, BODY *);
+void _mutt_make_string (char *, ssize_t, const char *, CONTEXT *,
+ HEADER *, format_flag);
+
+#define mutt_new_enter_state() p_new(ENTER_STATE, 1)
+
+typedef const char *format_t (char *, ssize_t, char, const char *,
+ const char *, const char *, const char *,
+ unsigned long, format_flag);
+
+void mutt_FormatString (char *, ssize_t, const char *, format_t *,
+ unsigned long, format_flag);