Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.541
diff -u -p -r1.541 e-msg-composer.c
--- composer/e-msg-composer.c	18 Sep 2006 17:21:36 -0000	1.541
+++ composer/e-msg-composer.c	10 Oct 2006 14:30:56 -0000
@@ -5162,6 +5162,38 @@ e_msg_composer_add_inline_image_from_mim
 	}
 }
 
+/* Stub for helping in printing of mails */
+CamelMimeMessage *
+e_msg_composer_get_message_print (EMsgComposer *composer, gboolean save_html_object_data)
+{
+	CamelMimeMessage *msg;
+	gboolean old_flags[4];
+	gboolean old_send_html;
+	EMsgComposerPrivate *p = composer->priv;
+	
+	/* create printable mail as HTML */
+	old_send_html = p->send_html;
+	p->send_html = TRUE;
+	old_flags[0] = p->pgp_sign;
+	p->pgp_sign = FALSE;
+	old_flags[1] = p->pgp_encrypt;
+	p->pgp_encrypt = FALSE;
+	old_flags[2] = p->smime_sign;
+	p->smime_sign = FALSE;
+	old_flags[3] = p->smime_encrypt;
+	p->smime_encrypt = FALSE;
+	
+	msg = build_message (composer, save_html_object_data);
+	
+	/* Revert back message's original settings */
+	p->send_html = old_send_html;
+	p->pgp_sign = old_flags[0];
+	p->pgp_encrypt = old_flags[1];
+	p->smime_sign = old_flags[2];
+	p->smime_encrypt = old_flags[3];
+	
+	return msg;
+}
 
 /**
  * e_msg_composer_get_message:
@@ -5183,7 +5215,7 @@ e_msg_composer_get_message (EMsgComposer
 		}
 	}
 	
-	return build_message (composer, save_html_object_data);
+	return e_msg_composer_get_message_print (composer, save_html_object_data);
 }
 
 CamelMimeMessage *
Index: composer/e-msg-composer.h
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.h,v
retrieving revision 1.96
diff -u -p -r1.96 e-msg-composer.h
--- composer/e-msg-composer.h	7 Dec 2005 08:29:51 -0000	1.96
+++ composer/e-msg-composer.h	10 Oct 2006 14:30:56 -0000
@@ -94,6 +94,8 @@ CamelMimePart           *e_msg_composer_
 									  const char        *filename);
 void                     e_msg_composer_add_inline_image_from_mime_part  (EMsgComposer      *composer,
 									  CamelMimePart     *part);
+CamelMimeMessage        *e_msg_composer_get_message_print                (EMsgComposer      *composer,
+                                                                          gboolean save_html_object_data);
 CamelMimeMessage        *e_msg_composer_get_message                      (EMsgComposer      *composer,
 									  gboolean           save_html_object_data);
 CamelMimeMessage        *e_msg_composer_get_message_draft                (EMsgComposer      *composer);
Index: plugins/print-message/print-message.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/print-message/print-message.c,v
retrieving revision 1.2
diff -u -p -r1.2 print-message.c
--- plugins/print-message/print-message.c	24 Aug 2005 03:14:10 -0000	1.2
+++ plugins/print-message/print-message.c	10 Oct 2006 14:31:12 -0000
@@ -83,7 +83,8 @@ org_gnome_print_message (EPlugin *ep, EM
 	data->config = e_print_load_config ();
 	data->preview = 0;
 	
-	data->msg = e_msg_composer_get_message (composer, 1);
+	data->msg = e_msg_composer_get_message_print (composer, TRUE);
+	
 	dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config);
 	gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
 	e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer);
@@ -104,7 +105,7 @@ org_gnome_print_preview (EPlugin *ep, EM
 	data->config = e_print_load_config ();
 	data->preview = 0;
 	
-	data->msg = e_msg_composer_get_message (composer, 1);
+	data->msg = e_msg_composer_get_message_print (composer, TRUE);
 
 	print_response(NULL, GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, data);
 }
