Index: mail-config.glade
===================================================================
--- mail-config.glade	(revision 33283)
+++ mail-config.glade	(working copy)
@@ -7150,6 +7150,14 @@
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
+                                              <child>
+						<widget class="GtkMenuItem" id="convertwidget50">
+						  <property name="visible">True</property>
+						  <property name="label" translatable="yes">Inline original message (Outlook style)</property>
+						  <property name="use_underline">True</property>
+						</widget>
+					      </child>
+
 					    </widget>
 					  </child>
 					</widget>
Index: em-composer-utils.c
===================================================================
--- em-composer-utils.c	(revision 33283)
+++ em-composer-utils.c	(working copy)
@@ -1849,6 +1849,12 @@
 		e_msg_composer_attach (composer, part);
 		camel_object_unref (part);
 		break;
+	case MAIL_CONFIG_REPLY_OUTLOOK:
+		text = em_utils_message_to_html(message, _("-----Original Message-----"), EM_FORMAT_QUOTE_HEADERS, &len, source);
+		e_msg_composer_set_body_text(composer, text, len);
+		g_free (text);
+		break;
+
 	case MAIL_CONFIG_REPLY_QUOTED:
 	default:
 		/* do what any sane user would want when replying... */
Index: mail-config.h
===================================================================
--- mail-config.h	(revision 33283)
+++ mail-config.h	(working copy)
@@ -69,7 +69,8 @@
 typedef enum {
 	MAIL_CONFIG_REPLY_QUOTED,
 	MAIL_CONFIG_REPLY_DO_NOT_QUOTE,
-	MAIL_CONFIG_REPLY_ATTACH
+	MAIL_CONFIG_REPLY_ATTACH,
+	MAIL_CONFIG_REPLY_OUTLOOK
 } MailConfigReplyStyle;
 
 typedef enum {
