diff --git a/kpimtextedit/richtextbuilders/CMakeLists.txt b/kpimtextedit/richtextbuilders/CMakeLists.txt
index 367b5eb52..bc9423c5b 100644
--- a/kpimtextedit/richtextbuilders/CMakeLists.txt
+++ b/kpimtextedit/richtextbuilders/CMakeLists.txt
@@ -1,20 +1,23 @@
 PROJECT( krichtexteditor )
 FIND_PACKAGE(KDE4 REQUIRED)
 INCLUDE_DIRECTORIES( ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} )
 
 SET(krichtexteditorSources
   main.cpp
   krichtexteditor.cpp
   markupdirector.cpp
+  htmlbuilder.cpp
+  plaintextmarkupbuilder.cpp
+  mediawikimarkupbuilder.cpp
   )
 
 KDE4_ADD_EXECUTABLE(krichtexteditor ${krichtexteditorSources} )
 TARGET_LINK_LIBRARIES(krichtexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} )
 
 install(TARGETS krichtexteditor DESTINATION ${BIN_INSTALL_DIR})
 install(FILES
   krichtexteditorui.rc
   DESTINATION  ${DATA_INSTALL_DIR}/krichtexteditor)
 
 
 
diff --git a/kpimtextedit/richtextbuilders/abstractmarkupbuilder.h b/kpimtextedit/richtextbuilders/abstractmarkupbuilder.h
index 86c4b9d98..591c1e870 100755
--- a/kpimtextedit/richtextbuilders/abstractmarkupbuilder.h
+++ b/kpimtextedit/richtextbuilders/abstractmarkupbuilder.h
@@ -1,207 +1,293 @@
 /*
     This file is part of KDE.
 
     Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 // Any class for which you cannot create instances is an abstract class.
 
 #ifndef ABSTRACTMARKUPBUILDER_H
 #define ABSTRACTMARKUPBUILDER_H
 
 
 #include <QString>
 #include <QBrush>
 #include <QTextList>
+#include <QTextDocument>
 
 /**
 @brief The AbstractMarkupBuilder class serves as a base class for creating marked up plain text output.
 
 The AbstractMarkupBuilder is used by the MarkupDirector to create marked up output such as html or markdown.
 
 Subclasses can reimplement whichever methods they choose. None of the methods are pure virtual and all default to an empty function
 to allow a clean fall-through. The exception is appendLiteralText, which appends its argument to the text being built.
 
-See PlainTextMarkupBuilder and HTMLBuilder for example imlpementations.
+See PlainTextMarkupBuilder and HTMLBuilder for example implementations.
 
 @note For maintenance, if an extra tag is needed which is not provided by the virtual methods, the ExtraElement can be used.
 
 eg,
 
 @code
 
 builder->beginExtraElement(AbstractMarkupBuilder::DivTag);
 // ...
 builder->endExtraElement(AbstractMarkupBuilder::DivTag);
 
 @endcode
 
 @todo Move this to kdelibs when tested.
 
 @author Stephen Kelly <steveire@gmail.com>
 @since 4.2
 */
 class AbstractMarkupBuilder
 {
 public:
 
     /** For future compatibility.
     This enum can be used to insert extra tags not supported by the virtual methods. */
     enum ExtraElement { UserElement = 100 };
-    
+
     /** Destructor */
     virtual ~AbstractMarkupBuilder() {}
 
     /** Begin a bold element in the markup */
     virtual void beginStrong() { }
+
     /** Close the bold element in the markup */
     virtual void endStrong() { }
+
     /** Begin an emphasised element in the markup */
     virtual void beginEmph() { }
+
     /** Close the emphasised element in the markup */
     virtual void endEmph() { }
+
     /** Begin an underlined element in the markup */
     virtual void beginUnderline() { }
+
     /** Close the underlined element in the markup */
     virtual void endUnderline() { }
+
     /** Begin a striked out element in the markup */
     virtual void beginStrikeout() { }
+
     /** Close the striked out element in the markup */
     virtual void endStrikeout() { }
+
     /** Begin a decorarated foreground element in the markup (A text color) */
-    virtual void beginForeground(const QBrush &) { }
+    virtual void beginForeground(const QBrush &brush) { Q_UNUSED(brush); }
+
     /** Close the decorarated foreground element in the markup */
     virtual void endForeground() { }
+
     /** Begin a decorarated background element in the markup (A text background color) */
-    virtual void beginBackground(const QBrush &) { }
+    virtual void beginBackground(const QBrush &brush) { Q_UNUSED(brush); }
+
     /** Close the decorarated background element in the markup */
     virtual void endBackground() { }
-    /** Begin a url anchor element in the markup     
-    @param The href of the link.    
+
+    /** Begin a url anchor element in the markup
+    @param href The href of the anchor.
+    @param name The name of the anchor.
+    */
+    virtual void beginNamedLinkedAnchor(const QString &href, const QString &name) {
+        Q_UNUSED(href);
+        Q_UNUSED(name);
+    }
+
+    /** Begin a url anchor element in the markup
+    @param name The name of the anchor.
     */
-    virtual void beginAnchor(const QString &) { }
+    virtual void beginNamedAnchor(const QString &name) {
+        Q_UNUSED(name);
+    }
+
+    /** Begin a url anchor element in the markup
+    @param href The href of the anchor.
+    */
+    virtual void beginLinkedAnchor(const QString &href) {
+        Q_UNUSED(href);
+    }
     /** Close the anchor element */
     virtual void endAnchor() { }
 
-    /** Begin a new font familiy element in the markup     
-    @param The name of the font familiy to begin.
+    /** Begin a new font familiy element in the markup
+    @param family The name of the font family to begin.
     */
-    virtual void beginFontFamily(const QString &) { }
+    virtual void beginFontFamily(const QString &family) {
+        Q_UNUSED(family);
+    }
     /** End font family element */
     virtual void endFontFamily() { }
-    
+
     /** Begin a new font point size element in the markup
-    @param the point size to begin.
+    @param int The point size to begin.
     */
-    virtual void beginFontPointSize( int ) { }
+    virtual void beginFontPointSize( int size) {
+        Q_UNUSED(size);
+    }
     /** End font point size element */
     virtual void endFontPointSize() { }
 
-//    /** Begin a new paragraph in the markup
-//    @param The alignment of the new paragraph.
-//     */
-//     virtual void beginParagraph(Qt::Alignment) { }
-
     /** Begin a new paragraph in the markup
-    @param The alignment of the new paragraph.
-    @param The top margin of the new paragraph.
-    @param The bottom margin of the new paragraph.
-     */
-    virtual void beginParagraph(Qt::Alignment, qreal, qreal) { }
-
-    virtual void beginParagraph(Qt::Alignment) { }
-    
+    @param a The alignment of the new paragraph.
+    @param top The top margin of the new paragraph.
+    @param bottom The bottom margin of the new paragraph.
+    @param left The left margin of the new paragraph.
+    @param right The right margin of the new paragraph.
+    */
+    virtual void beginParagraph(Qt::Alignment a, qreal top, qreal bottom, qreal left, qreal right) {
+        Q_UNUSED(a);
+        Q_UNUSED(top);
+        Q_UNUSED(bottom);
+        Q_UNUSED(left);
+        Q_UNUSED(right);
+    }
+
+
     /** Close the paragraph in the markup. */
     virtual void endParagraph() { }
     /** Add a newline to the markup. */
     virtual void addNewline() { }
 
     /** Insert a horizontal rule into the markup.
-    @warning This is never called by the MarkupDirector as there is no way to know if a QTextDocument contains a horizontal rule.
-    Just a placeholder until a workaround is written.
     */
-    virtual void insertHorizontalRule() { }
-    
+    virtual void insertHorizontalRule(int width = -1) {
+        Q_UNUSED(width);
+    }
+
     /**
     Insert a new image element into the markup.
-    @param The url of the image
-    @param The width of the image
-    @param The height of the image.
+    @param url The url of the image
+    @param width The width of the image
+    @param height The height of the image.
     */
-    virtual void insertImage(const QString &, qreal, qreal) { }
+    virtual void insertImage(const QString &url, qreal width, qreal height) {
+        Q_UNUSED(url);
+        Q_UNUSED(width);
+        Q_UNUSED(height);
+    }
 
     /**
     Begin a new list element in the markup.
     A list element contains list items, and may contain other lists.
-    @param The style of list to create.
+    @param style The style of list to create.
     */
-    virtual void beginList(QTextListFormat::Style) { }
-    
+    virtual void beginList(QTextListFormat::Style style) {
+        Q_UNUSED(style);
+    }
+
     /**
     Close the list.
     */
     virtual void endList() { }
+
     /** Begin a new list item in the markup */
     virtual void beginListItem() { }
+
     /** End the list item */
     virtual void endListItem() { }
 
     /** Begin a superscript element */
     virtual void beginSuperscript() { }
 
     /** End superscript element */
     virtual void endSuperscript() { }
-    
+
     /** Begin a subscript element */
     virtual void beginSubscript() { }
-    
+
     /** End subscript element */
     virtual void endSubscript() { }
 
-    virtual void beginTable(qreal, qreal, const QString &) { }
+
+    virtual void beginTable(qreal, qreal, const QString &) {
+
+    }
+
     virtual void beginTableRow() { }
-    virtual void beginTableHeaderCell(QString, int, int) { }
-    virtual void beginTableCell(QString, int, int) { }
+
+    virtual void beginTableHeaderCell(QString, int, int) {
+
+    }
+
+    virtual void beginTableCell(QString, int, int) {
+
+    }
 
     virtual void endTable() { }
+
     virtual void endTableRow() { }
+
     virtual void endTableHeaderCell() { }
+
     virtual void endTableCell() { }
 
-    /** Begin an extra identified element. Override this to support more elements in the future. */
-    virtual void beginExtraElement(int, QVariantList) { }
+    virtual void beginHeader1() { }
+    virtual void beginHeader2() { }
+    virtual void beginHeader3() { }
+    virtual void beginHeader4() { }
+    virtual void beginHeader5() { }
+    virtual void beginHeader6() { }
+
+    virtual void endHeader1() { }
+    virtual void endHeader2() { }
+    virtual void endHeader3() { }
+    virtual void endHeader4() { }
+    virtual void endHeader5() { }
+    virtual void endHeader6() { }
 
-    /** End extra tag. */
-    virtual void endExtraElement(int) { }
+
+    /** Begin an extra identified element. Override this to support more elements
+    in the future in a BC way.
+
+    @param type The type of element to create
+    @param args Arguments for the element.
+    */
+    virtual void beginExtraElement(int type, QVariantList args) {
+        Q_UNUSED(type);
+        Q_UNUSED(args);
+    }
+
+    /** End extra tag.
+
+    @param type The type of the tag to end.
+    */
+    virtual void endExtraElement(int type) {
+        Q_UNUSED(type);
+    }
 
     /**
     Append the plain text @p text to the markup.
-    
+
     @param The text to append.
     */
-    virtual void appendLiteralText(const QString &text ) = 0; 
+    virtual void appendLiteralText(const QString &text ) = 0;
 
     /** Return the fully marked up result of the building process. This may contain metadata etc, such as a head element in html.
-    
+
     @return The fully marked up text.
     */
     virtual QString& getResult() = 0;
 
 };
 
 #endif
diff --git a/kpimtextedit/richtextbuilders/bbcodebuilder.cpp b/kpimtextedit/richtextbuilders/bbcodebuilder.cpp
new file mode 100644
index 000000000..46bddc46c
--- /dev/null
+++ b/kpimtextedit/richtextbuilders/bbcodebuilder.cpp
@@ -0,0 +1,140 @@
+/*
+    This file is part of KDE.
+
+    Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+
+
+#include "bbcodebuilder.h"
+#include <kdebug.h>
+
+BBCodeBuilder::BBCodeBuilder() {
+
+    currentAlignment = Qt::AlignLeft; //Default value
+}
+
+void BBCodeBuilder::beginStrong() { m_text.append("[B]"); }
+void BBCodeBuilder::endStrong() { m_text.append("[/B]"); }
+void BBCodeBuilder::beginEmph() { m_text.append("[I]"); }
+void BBCodeBuilder::endEmph() { m_text.append("[/I]"); }
+void BBCodeBuilder::beginUnderline() { m_text.append("[U]"); }
+void BBCodeBuilder::endUnderline() { m_text.append("[/U]"); }
+void BBCodeBuilder::beginStrikeout() { m_text.append("[S]"); }
+void BBCodeBuilder::endStrikeout() { m_text.append("[/S]"); }
+void BBCodeBuilder::beginForeground(const QBrush &brush) { m_text.append(QString("[COLOR=%1]").arg(brush.color().name())); }
+void BBCodeBuilder::endForeground() { m_text.append("[/COLOR]"); }
+
+// Background colour not supported by BBCode.
+
+void BBCodeBuilder::beginAnchor(const QString &href) { m_text.append(QString("[URL=%1]").arg(href)); }
+void BBCodeBuilder::endAnchor() { m_text.append("[/URL]"); }
+
+// Font family not supported by BBCode.
+
+void BBCodeBuilder::beginFontPointSize(int size) { m_text.append(QString("[SIZE=%1]").arg(QString::number(size))); }
+void BBCodeBuilder::endFontPointSize() { m_text.append("[/SIZE]"); }
+
+void BBCodeBuilder::beginParagraph(Qt::Alignment a, qreal top, qreal bottom, qreal left, qreal right) {
+    Q_UNUSED(top);
+    Q_UNUSED(bottom);
+    Q_UNUSED(left);
+    Q_UNUSED(right);
+    if (a & Qt::AlignRight){
+        m_text.append("\n[Right]");
+    }
+    else if (a & Qt::AlignHCenter){
+        m_text.append("\n[CENTER]");
+    }
+    // LEFT is also supported in BBCode, but ignored.
+    currentAlignment = a;
+}
+void BBCodeBuilder::endParagraph() {
+    if (currentAlignment & Qt::AlignRight){
+        m_text.append("\n[/Right]\n");
+    }
+    else if (currentAlignment & Qt::AlignHCenter){
+        m_text.append("\n[/CENTER]\n");
+    }
+    else{
+        m_text.append("\n");
+    }
+    currentAlignment = Qt::AlignLeft;
+
+}
+void BBCodeBuilder::addNewline() { m_text.append("\n"); }
+
+void BBCodeBuilder::insertImage(const QString &src, qreal width, qreal height) {
+    Q_UNUSED(width);
+    Q_UNUSED(height);
+    m_text.append(QString("[IMG]%1[/IMG]").arg(src));
+}
+
+void BBCodeBuilder::beginList(QTextListFormat::Style type) {
+    switch(type){
+    case QTextListFormat::ListDisc:
+    case QTextListFormat::ListCircle:
+    case QTextListFormat::ListSquare:
+        m_text.append("[LIST]\n"); // Unordered lists are all disc type in BBCode.
+        break;
+    case QTextListFormat::ListDecimal:
+        m_text.append("[LIST=1]\n");
+        break;
+    case QTextListFormat::ListLowerAlpha:
+        m_text.append("[LIST=a]\n");
+        break;
+    case QTextListFormat::ListUpperAlpha:
+        m_text.append("[LIST=A]\n");
+        break;
+    default:
+        break;
+    }
+}
+
+void BBCodeBuilder::endList() { m_text.append("[/LIST]\n"); }
+
+
+void BBCodeBuilder::beginListItem() { m_text.append("[*] "); }
+
+void BBCodeBuilder::beginSuperscript() { m_text.append("[SUP]"); }
+
+void BBCodeBuilder::endSuperscript() { m_text.append("[/SUP]"); }
+
+void BBCodeBuilder::beginSubscript() { m_text.append("[SUB]"); }
+
+void BBCodeBuilder::endSubscript() { m_text.append("[/SUB]"); }
+
+
+void BBCodeBuilder::beginTable(qreal, qreal, const QString &) { m_text.append("[TABLE]\n"); }
+
+void BBCodeBuilder::beginTableRow() { m_text.append("[/TABLE]"); }
+
+
+void BBCodeBuilder::appendLiteralText(const QString &text) { m_text.append(escape(text)); }
+
+const QString BBCodeBuilder::escape(const QString &s)
+{
+    if (s.contains("["))
+    {
+        return QString("[NOPARSE]" + s + "[/NOPARSE]" );
+    }
+    return s;
+}
+
+virtual QString& BBCodeBuilder::getResult() { return m_text; }
+
diff --git a/kpimtextedit/richtextbuilders/bbcodebuilder.h b/kpimtextedit/richtextbuilders/bbcodebuilder.h
new file mode 100755
index 000000000..42fb3004b
--- /dev/null
+++ b/kpimtextedit/richtextbuilders/bbcodebuilder.h
@@ -0,0 +1,102 @@
+/*
+    This file is part of KDE.
+
+    Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+
+
+#include "abstractmarkupbuilder.h"
+#include <kdebug.h>
+
+/**
+Creates BBCode from a QTextDocument
+*/
+class BBCodeBuilder : public AbstractMarkupBuilder
+{
+public:
+
+    /**
+Creates a new BBCodeBuilder.
+    */
+    BBCodeBuilder();
+
+    virtual void beginStrong();
+    virtual void endStrong();
+    virtual void beginEmph();
+    virtual void endEmph();
+    virtual void beginUnderline();
+    virtual void endUnderline();
+    virtual void beginStrikeout();
+    virtual void endStrikeout();
+    virtual void beginForeground(const QBrush &brush);
+    virtual void endForeground();
+
+    // Background colour not supported by BBCode.
+
+    virtual void beginAnchor(const QString &href);
+    virtual void endAnchor();
+
+    // Font family not supported by BBCode.
+
+    virtual void beginFontPointSize(int size);
+    virtual void endFontPointSize();
+
+    virtual void beginParagraph(Qt::Alignment a, qreal top, qreal bottom, qreal left, qreal right);
+
+    virtual void endParagraph();
+    virtual void addNewline();
+
+    virtual void insertImage(const QString &src, qreal width, qreal height);
+
+    virtual void beginList(QTextListFormat::Style type);
+
+    virtual void endList();
+
+
+    virtual void beginListItem();
+
+    virtual void beginSuperscript();
+
+    virtual void endSuperscript();
+
+    virtual void beginSubscript();
+
+    virtual void endSubscript();
+
+
+    virtual void beginTable(qreal, qreal, const QString &);
+
+    virtual void beginTableRow();
+
+
+    virtual void appendLiteralText(const QString &text);
+
+    const QString escape(const QString &s);
+
+    virtual QString& getResult();
+
+private:
+    QList<QTextListFormat::Style> currentListItemStyles;
+
+    QString m_text;
+
+    Qt::Alignment currentAlignment;
+
+};
+
diff --git a/kpimtextedit/richtextbuilders/htmlbuilder.cpp b/kpimtextedit/richtextbuilders/htmlbuilder.cpp
new file mode 100644
index 000000000..27d7a840f
--- /dev/null
+++ b/kpimtextedit/richtextbuilders/htmlbuilder.cpp
@@ -0,0 +1,317 @@
+
+#include "htmlbuilder.h"
+
+#include <QTextDocument>
+
+HTMLBuilder::HTMLBuilder()
+{
+
+}
+
+HTMLBuilder::~HTMLBuilder()
+{
+
+}
+
+void HTMLBuilder::beginStrong()
+{
+    m_text.append("<strong>");
+}
+
+void HTMLBuilder::endStrong()
+{
+    m_text.append("</strong>");
+}
+
+void HTMLBuilder::beginEmph()
+{
+    m_text.append("<em>");
+}
+
+void HTMLBuilder::endEmph()
+{
+    m_text.append("</em>");
+}
+
+void HTMLBuilder::beginUnderline()
+{
+    m_text.append("<u>");
+}
+
+void HTMLBuilder::endUnderline()
+{
+    m_text.append("</u>");
+}
+
+void HTMLBuilder::beginStrikeout()
+{
+    m_text.append("<s>");
+}
+
+void HTMLBuilder::endStrikeout()
+{
+    m_text.append("</s>");
+}
+
+void HTMLBuilder::beginForeground(const QBrush &brush)
+{
+    m_text.append(QString("<span style=\"color:%1;\">").arg(brush.color().name()));
+}
+
+void HTMLBuilder::endForeground()
+{
+    m_text.append("</span>");
+}
+
+void HTMLBuilder::beginBackground(const QBrush &brush)
+{
+    m_text.append(QString("<span style=\"background-color:%1;\">").arg(brush.color().name()));
+}
+
+void HTMLBuilder::endBackground()
+{
+    m_text.append("</span>");
+}
+
+void HTMLBuilder::endAnchor()
+{
+    m_text.append("</a>");
+}
+
+void HTMLBuilder::beginFontFamily(const QString &family)
+{
+    m_text.append(QString("<span style=\"font-family:%1;\">").arg(family));
+}
+
+void HTMLBuilder::endFontFamily() {
+    m_text.append("</span>");
+}
+
+void HTMLBuilder::beginFontPointSize(int size) {
+    m_text.append(QString("<span style=\"font-size:%1pt;\">").arg(QString::number(size)));
+}
+
+void HTMLBuilder::endFontPointSize() {
+    m_text.append("</span>");
+}
+
+void HTMLBuilder::beginParagraph(Qt::Alignment al, qreal topMargin, qreal bottomMargin, qreal leftMargin, qreal rightMargin)
+{
+    // Don't put paragraph tags inside li tags. Qt bug reported.
+//     if (currentListItemStyles.size() != 0)
+//     {
+        QString styleString;
+        if ( topMargin != 0 ) { styleString.append( QString( "margin-top:%1;" ).arg( topMargin ) ); }
+        if ( bottomMargin != 0 ) { styleString.append( QString( "margin-bottom:%1;" ).arg( bottomMargin ) ); }
+        if ( leftMargin != 0 ) { styleString.append( QString( "margin-left:%1;" ).arg( leftMargin ) ); }
+        if ( rightMargin != 0 ) { styleString.append( QString( "margin-right:%1;" ).arg( rightMargin ) ); }
+
+        // Using == doesn't work here.
+        // Using bitwise comparison because an alignment can contain a vertical and a horizontal part.
+        if (al & Qt::AlignRight){
+            m_text.append( "<p align=\"right\" " );
+        }
+        else if (al & Qt::AlignHCenter){
+            m_text.append( "<p align=\"center\" " );
+        }
+        else if (al & Qt::AlignJustify){
+            m_text.append( "<p align=\"justify\" " );
+        }
+        else if (al & Qt::AlignLeft){
+            m_text.append( "<p " );
+        }
+        else{
+            m_text.append( "<p " );
+        }
+
+        if ( !styleString.isEmpty() )
+        {
+            m_text.append( "\"" + styleString + "\"" );
+        }
+        m_text.append( " >" );
+//     }
+}
+
+void HTMLBuilder::beginHeader1() {
+    m_text.append("<h1>");
+}
+
+void HTMLBuilder::beginHeader2() {
+    m_text.append("<h2>");
+}
+
+void HTMLBuilder::beginHeader3() {
+    m_text.append("<h3>");
+}
+
+void HTMLBuilder::beginHeader4() {
+    m_text.append("<h4>");
+}
+
+void HTMLBuilder::beginHeader5() {
+    m_text.append("<h5>");
+}
+
+void HTMLBuilder::beginHeader6() {
+    m_text.append("<h6>");
+}
+
+void HTMLBuilder::endHeader1() {
+    m_text.append("</h1>");
+}
+
+void HTMLBuilder::endHeader2() {
+    m_text.append("</h2>");
+}
+
+void HTMLBuilder::endHeader3() {
+    m_text.append("</h3>");
+}
+
+void HTMLBuilder::endHeader4() {
+    m_text.append("</h4>");
+}
+
+void HTMLBuilder::endHeader5() {
+    m_text.append("</h5>");
+}
+
+void HTMLBuilder::endHeader6() {
+    m_text.append("</h6>");
+}
+
+void HTMLBuilder::endParagraph() {
+    m_text.append("\n</p>\n");
+}
+
+void HTMLBuilder::addNewline() {
+    m_text.append("<br />\n");
+}
+
+void HTMLBuilder::insertHorizontalRule( int width )
+{
+    if( width != -1 )
+    {
+        m_text.append( QString( "<hr width=\"%1\" />\n" ).arg(width) );
+    }
+    m_text.append( "<hr />\n" );
+}
+
+void HTMLBuilder::insertImage(const QString &src, qreal width, qreal height)
+{
+    m_text.append(QString("<img src=\"%1\" width=\"%2\" height=\"%3\" />").arg(src).arg(width).arg(height));
+}
+
+void HTMLBuilder::beginList(QTextListFormat::Style type) {
+    currentListItemStyles.append(type);
+    switch(type){
+    case QTextListFormat::ListDisc:
+        m_text.append("\n<ul type=\"disc\">\n");
+        break;
+    case QTextListFormat::ListCircle:
+        m_text.append("\n<ul type=\"circle\">\n");
+        break;
+    case QTextListFormat::ListSquare:
+        m_text.append("\n<ul type=\"square\">\n");
+        break;
+    case QTextListFormat::ListDecimal:
+        m_text.append("\n<ol type=\"1\">\n");
+        break;
+    case QTextListFormat::ListLowerAlpha:
+        m_text.append("\n<ol type=\"a\">\n");
+        break;
+    case QTextListFormat::ListUpperAlpha:
+        m_text.append("\n<ol type=\"A\">\n");
+        break;
+    default:
+        break;
+    }
+}
+void HTMLBuilder::endList() {
+    switch(currentListItemStyles.last()){
+    case QTextListFormat::ListDisc:
+    case QTextListFormat::ListCircle:
+    case QTextListFormat::ListSquare:
+        m_text.append("\n</ul>\n");
+        break;
+    case QTextListFormat::ListDecimal:
+    case QTextListFormat::ListLowerAlpha:
+    case QTextListFormat::ListUpperAlpha:
+        m_text.append("\n</ol>\n");
+        break;
+    default:
+        break;
+    }
+    currentListItemStyles.removeLast();
+}
+void HTMLBuilder::beginListItem() {
+    m_text.append("<li>");
+}
+
+void HTMLBuilder::endListItem() {
+    m_text.append("</li>\n");
+}
+
+void HTMLBuilder::beginSuperscript() {
+    m_text.append("<sup>");
+}
+
+void HTMLBuilder::endSuperscript() {
+    m_text.append("</sup>");
+}
+
+void HTMLBuilder::beginSubscript() {
+    m_text.append("<sub>");
+}
+
+void HTMLBuilder::endSubscript() {
+    m_text.append("</sub>");
+}
+
+
+void HTMLBuilder::beginTable(qreal cellpadding, qreal cellspacing, const QString &width) {
+    m_text.append(QString("<table cellpadding=\"%1\" cellspacing=\"%2\" width=\"%3\" border=\"1\">")
+            .arg(cellpadding)
+            .arg(cellspacing)
+            .arg(width));
+}
+
+void HTMLBuilder::beginTableRow() {
+    m_text.append("<tr>");
+}
+
+void HTMLBuilder::beginTableHeaderCell(QString width, int colspan, int rowspan) {
+    m_text.append(QString("<th width=\"%1\" colspan=\"%2\" rowspan=\"%3\">").arg(width).arg(colspan).arg(rowspan));
+}
+
+void HTMLBuilder::beginTableCell(QString width, int colspan, int rowspan) {
+    m_text.append(QString("<td width=\"%1\" colspan=\"%2\" rowspan=\"%3\">").arg(width).arg(colspan).arg(rowspan));
+}
+
+void HTMLBuilder::endTable() {
+    m_text.append("</table>");
+}
+
+void HTMLBuilder::endTableRow() {
+    m_text.append("</tr>");
+}
+
+void HTMLBuilder::endTableHeaderCell() {
+    m_text.append("</th>");
+}
+
+void HTMLBuilder::endTableCell() {
+    m_text.append("</td>");
+}
+
+
+void HTMLBuilder::appendLiteralText(const QString &text) {
+    QString s("ert");
+    Qt::mightBeRichText(s);
+    m_text.append(Qt::escape(text));
+}
+
+
+QString& HTMLBuilder::getResult() {
+    return m_text;
+}
diff --git a/kpimtextedit/richtextbuilders/htmlbuilder.h b/kpimtextedit/richtextbuilders/htmlbuilder.h
index 6aacfc14f..4e97a9e3a 100755
--- a/kpimtextedit/richtextbuilders/htmlbuilder.h
+++ b/kpimtextedit/richtextbuilders/htmlbuilder.h
@@ -1,253 +1,192 @@
 /*
     This file is part of KDE.
 
     Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #ifndef HTMLBUILDER_H
 #define HTMLBUILDER_H
 
 #include "abstractmarkupbuilder.h"
 
 /**
 @brief The HTMLBuilder creates a clean html markup output.
 
 This class creates html output which is as minimal as possible and restricted to the rich text features supported in Qt. (http://doc.trolltech.com/4.4/richtext-html-subset.htm)
 
 The output contains only the body content, not the head element or other metadata.
 
 eg:
 
+@code
     This is some <strong>formatted content</strong> in a paragraph.
-    
-instead of: 
+@endcode
 
+instead of:
+
+@code
     <head>
     <title>Some text</title>
     <head>
     <body>
         This is some <strong>formatted content</strong> in a paragraph.
     </body>
     </html>
+@endcode
 
 Such tags should be created separately. For example:
 
-        AbstractMarkupBuilder *b = new HTMLBuilder();        
+@code
+        AbstractMarkupBuilder *b = new HTMLBuilder();
         MarkupDirector *md = new MarkupDirector(b);
-        md->constructContent();        
+        md->constructContent();
         QString cleanHtml("<head>\n<title>%1</title>\n</head>\n<body>%2</body>\n</html>")
                     .arg(document.metaInformation(QTextDocument::DocumentTitle))
-                    .arg(b->getOutput());   
+                    .arg(b->getOutput());
         QFile.write(cleanHtml);
+@endcode
 
 Font formatting information on elements is represented by individual span elements.
 eg:
+@code
     <span style"color:blue;"><span style="background-color:red;">Blue text on red background</span></span>
-instead of 
+@endcode
+instead of
+@code
     <span style="color:blue;background-color:red;">Blue text on red background</span>
-    
+@endcode
  It my be possible to change this if neccessary.
 
 @todo Move this to kdelibs when tested and prooven.
 
 @author Stephen Kelly <steveire@gmail.com>
 @since 4.2
 
 */
 class HTMLBuilder : public AbstractMarkupBuilder
 {
 public:
 
     /**
 Creates a new HTMLBuilder.
     */
-    HTMLBuilder() {}
-
-    virtual void beginStrong() { m_text.append("<strong>"); }
-    virtual void endStrong() { m_text.append("</strong>"); }
-    virtual void beginEmph() { m_text.append("<em>"); }
-    virtual void endEmph() { m_text.append("</em>"); }
-    virtual void beginUnderline() { m_text.append("<u>"); }
-    virtual void endUnderline() { m_text.append("</u>"); }
-    virtual void beginStrikeout() { m_text.append("<s>"); } 
-    virtual void endStrikeout() { m_text.append("</s>"); }
-    virtual void beginForeground(const QBrush &brush) { m_text.append(QString("<span style=\"color:%1;\">").arg(brush.color().name())); }
-    virtual void endForeground() { m_text.append("</span>"); }
-    virtual void beginBackground(const QBrush &brush) { m_text.append(QString("<span style=\"background-color:%1;\">").arg(brush.color().name())); }
-    virtual void endBackground() { m_text.append("</span>"); }
-    virtual void beginAnchor(const QString &href) { m_text.append(QString("<a href=\"%1\">").arg(href)); }
-    virtual void endAnchor() { m_text.append("</a>"); }
+    HTMLBuilder();
+    virtual ~HTMLBuilder();
+
+    virtual void beginStrong();
+    virtual void endStrong();
+    virtual void beginEmph();
+    virtual void endEmph();
+    virtual void beginUnderline();
+    virtual void endUnderline();
+    virtual void beginStrikeout();
+    virtual void endStrikeout();
+    virtual void beginForeground(const QBrush &brush);
+    virtual void endForeground();
+    virtual void beginBackground(const QBrush &brush);
+    virtual void endBackground();
+    virtual void beginLinkedAnchor(const QString &href) { m_text.append(QString("<a href=\"%1\">").arg(href)); }
+    virtual void endAnchor();
 
     // Maybe this stuff should just be added to a list, and then when I add literal text,
     // add some kind of style attribute in one span instead of many.
-    virtual void beginFontFamily(const QString &family) { m_text.append(QString("<span style=\"font-family:%1;\">").arg(family)); }
-    virtual void endFontFamily() { m_text.append("</span>"); }
-    virtual void beginFontPointSize(int size) { m_text.append(QString("<span style=\"font-size:%1pt;\">").arg(QString::number(size))); }
-    virtual void endFontPointSize() { m_text.append("</span>"); }
-
-    virtual void beginParagraph(Qt::Alignment al, qreal topMargin, qreal bottomMargin)
-    {
-        QString styleString("style=\"margin-top:%1;margin-bottom:%2;\">\n");
-        styleString = styleString.arg(topMargin).arg(bottomMargin);
-        if (al & Qt::AlignRight){
-            m_text.append("<p align=\"right\" ");
-        }
-        else if (al & Qt::AlignHCenter){
-            m_text.append("<p align=\"center\" ");
-        }
-        else if (al & Qt::AlignJustify){
-            m_text.append("<p align=\"justify\" ");
-        }
-        else if (al & Qt::AlignLeft){
-            m_text.append("<p ");
-        }
-        else{
-            m_text.append("<p ");
-        }
-        m_text.append(styleString);
-    }
-    
-    virtual void beginParagraph(Qt::Alignment al)
-    {
-        if (al & Qt::AlignRight){
-            m_text.append("<p align=\"right\" >");
-        }
-        else if (al & Qt::AlignHCenter){
-            m_text.append("<p align=\"center\" >");
-        }
-        else if (al & Qt::AlignJustify){
-            m_text.append("<p align=\"justify\" >");
-        }
-        else if (al & Qt::AlignLeft){
-            m_text.append("<p>");
-        }
-        else{
-            m_text.append("<p>");
-        }
-    }
-    
-    virtual void endParagraph() { m_text.append("\n</p>\n"); }
-    virtual void addNewline() { m_text.append("<br />\n"); }
-
-    virtual void insertHorizontalRule() { m_text.append("<hr />\n"); }
-
-    virtual void insertImage(const QString &src, qreal width, qreal height) {
-        
-        m_text.append(QString("<img src=\"%1\" width=\"%2\" height=\"%3\" />").arg(src).arg(width).arg(height));
-    }
-
-    virtual void beginList(QTextListFormat::Style type) {
-        currentListItemStyles.append(type);
-        switch(type){
-        case QTextListFormat::ListDisc:
-            m_text.append("\n<ul type=\"disc\">\n");
-            break;
-        case QTextListFormat::ListCircle:
-            m_text.append("\n<ul type=\"circle\">\n");
-            break;
-        case QTextListFormat::ListSquare:
-            m_text.append("\n<ul type=\"square\">\n");
-            break;
-        case QTextListFormat::ListDecimal:
-            m_text.append("\n<ol type=\"1\">\n");
-            break;
-        case QTextListFormat::ListLowerAlpha:
-            m_text.append("\n<ol type=\"a\">\n");
-            break;
-        case QTextListFormat::ListUpperAlpha:
-            m_text.append("\n<ol type=\"A\">\n");
-            break;
-        default:
-            break;
-        }
-    }
-    virtual void endList() {
-        switch(currentListItemStyles.last()){
-        case QTextListFormat::ListDisc:
-        case QTextListFormat::ListCircle:
-        case QTextListFormat::ListSquare:
-            m_text.append("\n</ul>\n");
-            break;
-        case QTextListFormat::ListDecimal:
-        case QTextListFormat::ListLowerAlpha:
-        case QTextListFormat::ListUpperAlpha:
-            m_text.append("\n</ol>\n");
-            break;
-        default:
-            break;
-        }
-        currentListItemStyles.removeLast();
-    }
-    virtual void beginListItem() { m_text.append("<li>"); }
-    virtual void endListItem() { m_text.append("</li>\n"); }
-
-    virtual void beginSuperscript() { m_text.append("<sup>"); }
-
-    virtual void endSuperscript() { m_text.append("</sup>"); }
-    
-    virtual void beginSubscript() { m_text.append("<sub>"); }
-    
-    virtual void endSubscript() { m_text.append("</sub>"); }
-
-    
-    virtual void beginTable(qreal cellpadding, qreal cellspacing, const QString &width) {
-        m_text.append(QString("<table cellpadding=\"%1\" cellspacing=\"%2\" width=\"%3\" border=\"1\">")
-                .arg(cellpadding)
-                .arg(cellspacing)
-                .arg(width));
-    }
-    
-    virtual void beginTableRow() { m_text.append("<tr>"); }
-    virtual void beginTableHeaderCell(QString width, int colspan, int rowspan) {
-        m_text.append(QString("<th width=\"%1\" colspan=\"%2\" rowspan=\"%3\">").arg(width).arg(colspan).arg(rowspan));
-    }
-    
-    virtual void beginTableCell(QString width, int colspan, int rowspan) {
-        m_text.append(QString("<td width=\"%1\" colspan=\"%2\" rowspan=\"%3\">").arg(width).arg(colspan).arg(rowspan));
-    }
-    
-    virtual void endTable() { m_text.append("</table>"); }
-    virtual void endTableRow() { m_text.append("</tr>"); }
-    virtual void endTableHeaderCell() { m_text.append("</th>"); }
-    virtual void endTableCell() { m_text.append("</td>"); }
+    virtual void beginFontFamily(const QString &family);
+    virtual void endFontFamily();
+    virtual void beginFontPointSize(int size);
+    virtual void endFontPointSize();
+
+    virtual void beginParagraph(Qt::Alignment al, qreal topMargin, qreal bottomMargin, qreal leftMargin, qreal rightMargin);
+
+    virtual void beginHeader1();
+    virtual void beginHeader2();
+    virtual void beginHeader3();
+    virtual void beginHeader4();
+    virtual void beginHeader5();
+    virtual void beginHeader6();
+
+    virtual void endHeader1();
+    virtual void endHeader2();
+    virtual void endHeader3();
+    virtual void endHeader4();
+    virtual void endHeader5();
+    virtual void endHeader6();
+
+    virtual void endParagraph();
+    virtual void addNewline();
+
+    virtual void insertHorizontalRule(int width = -1);
+
+    virtual void insertImage(const QString &src, qreal width, qreal height);
+
+    virtual void beginList(QTextListFormat::Style type);
+
+    virtual void endList();
+
+    virtual void beginListItem();
+    virtual void endListItem();
+
+    virtual void beginSuperscript();
+
+    virtual void endSuperscript();
+
+    virtual void beginSubscript();
+
+    virtual void endSubscript();
+
+
+    virtual void beginTable(qreal cellpadding, qreal cellspacing, const QString &width);
+
+    virtual void beginTableRow();
+    virtual void beginTableHeaderCell(QString width, int colspan, int rowspan);
+
+    virtual void beginTableCell(QString width, int colspan, int rowspan);
+
+    virtual void endTable();
+    virtual void endTableRow();
+    virtual void endTableHeaderCell();
+    virtual void endTableCell();
 
     /**
     Reimplemented from AbstractMarkupBuilder.
-    
-    This implementation escapes the text before appending so that 
-    
+
+    This implementation escapes the text before appending so that
+
+    @verbatim
         A sample <b>bold</b> word.
-        
-    becomes 
-    
-         A sample &lt;b&gt;bold&lt;/b&gt; word.       
-    
+    @endverbatim
+
+    becomes
+
+    @verbatim
+         A sample &lt;b&gt;bold&lt;/b&gt; word.
+    @endverbatim
+
     */
-    virtual void appendLiteralText(const QString &text) { m_text.append(Qt::escape(text)); }
+    virtual void appendLiteralText(const QString &text);
+
 
-    
-    virtual QString& getResult() { return m_text; }
+    virtual QString& getResult();
 
 private:
     QList<QTextListFormat::Style> currentListItemStyles;
 
     QString m_text;
 
 };
 
 #endif
diff --git a/kpimtextedit/richtextbuilders/krichtexteditor.cpp b/kpimtextedit/richtextbuilders/krichtexteditor.cpp
index 9ab9e8fac..817a1d126 100644
--- a/kpimtextedit/richtextbuilders/krichtexteditor.cpp
+++ b/kpimtextedit/richtextbuilders/krichtexteditor.cpp
@@ -1,211 +1,245 @@
 /**
  * KDE Rich Text Editor
  *
  * Copyright 2008  Stephen Kelly <steveire@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
 
 #include "krichtexteditor.h"
 
 #include "abstractmarkupbuilder.h"
 #include "plaintextmarkupbuilder.h"
 #include "htmlbuilder.h"
+#include "bbcodebuilder.h"
+#include "mediawikimarkupbuilder.h"
+
 
 #include "markupdirector.h"
 
 #include <QTextDocument>
 #include <QDockWidget>
 #include <QLayout>
 #include <QPushButton>
 
 #include <QtCore/QTextStream>
 
 #include <kapplication.h>
 #include <kactioncollection.h>
 #include <kstandardaction.h>
 #include <kfiledialog.h>
 #include <KRichTextWidget>
 #include <kmessagebox.h>
 #include <kio/netaccess.h>
 #include <ksavefile.h>
 #include <kstatusbar.h>
 
 
 KRichTextEditor::KRichTextEditor() : KXmlGuiWindow()
 {
     setupActions();
 
     textArea = new KRichTextWidget(this);
 
 
     QPushButton *b = new QPushButton("Update!", this);
     connect(b, SIGNAL(pressed()), SLOT(updateDockedWidgets()));
 
     QVBoxLayout *l = new QVBoxLayout();
     QWidget *w = new QWidget();
     l->addWidget(textArea);
     l->addWidget(b);
     w->setLayout(l);
 
     setCentralWidget(w);
 
     textArea->createActions(actionCollection());
     setupGUI();
 
     statusBar()->insertItem(QString(), 0, 1);
     statusBar()->setItemAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
 
     connect(textArea, SIGNAL(cursorPositionChanged()),
             SLOT(cursorPositionChanged()));
 
     QDockWidget *dockText = new QDockWidget(QString("HTML"), this);
+    dockText->setObjectName( "HTML" );
     dockText->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     kte = new KTextEdit(dockText);
     dockText->setWidget(kte);
     addDockWidget(Qt::RightDockWidgetArea, dockText);
-//     connect(textArea, SIGNAL(cursorPositionChanged()), SLOT(updateDockedWidget()));
 
     QDockWidget *dockHtml = new QDockWidget(QString("Re-Rendered"), this);
+    dockHtml->setObjectName( "Re-Rendered" );
     dockHtml->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     krte = new KTextEdit(dockHtml);
     dockHtml->setWidget(krte);
     addDockWidget(Qt::RightDockWidgetArea, dockHtml);
-//     connect(textArea, SIGNAL(textChanged()), SLOT(updateDockedWidget()));
 
     QDockWidget *dockPlain = new QDockWidget(QString("Plain"), this);
+    dockPlain->setObjectName( "Plain" );
     dockPlain->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     kpte = new KTextEdit(dockPlain);
     dockPlain->setWidget(kpte);
     addDockWidget(Qt::RightDockWidgetArea, dockPlain);
-//     connect(textArea, SIGNAL(textChanged()), SLOT(updateDockedWidget()));
 
-    
-    
+    QDockWidget *dockBB = new QDockWidget(QString("BBCode"), this);
+    dockBB->setObjectName( "BBCode" );
+    dockBB->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    kbbte = new KTextEdit(dockBB);
+    dockBB->setWidget(kbbte);
+    addDockWidget(Qt::RightDockWidgetArea, dockBB);
+
+    QDockWidget *dockMW = new QDockWidget(QString("MediaWiki"), this);
+    dockMW->setObjectName( "MediaWiki" );
+    dockMW->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    kmwte = new KTextEdit(dockMW);
+    dockMW->setWidget(kmwte);
+    addDockWidget(Qt::RightDockWidgetArea, dockMW);
+
+
+
 }
 
 void KRichTextEditor::updateDockedWidgets()
 {
     HTMLBuilder *hb = new HTMLBuilder();
 
     MarkupDirector *hmd = new MarkupDirector(hb);
     hmd->constructContent(textArea->document());
 
     QString t = hb->getResult();
 
     kte->setPlainText(t);
     krte->setHtml(t);
 
     PlainTextMarkupBuilder *pb = new PlainTextMarkupBuilder();
 
     MarkupDirector *pmd = new MarkupDirector(pb);
     pmd->constructContent(textArea->document());
 
     kpte->setPlainText(pb->getResult());
 
+    BBCodeBuilder *bbb = new BBCodeBuilder();
+
+    MarkupDirector *bbmd = new MarkupDirector(bbb);
+    bbmd->constructContent(textArea->document());
+
+    kbbte->setPlainText(bbb->getResult());
+
+    MediaWikiMarkupBuilder *mwb = new MediaWikiMarkupBuilder();
+
+    MarkupDirector *mwmd = new MarkupDirector(mwb);
+    mwmd->constructContent(textArea->document());
+
+    kmwte->setPlainText(mwb->getResult());
+
+
+
+
 }
 
 KRichTextEditor::~KRichTextEditor()
 {
 }
 
 void KRichTextEditor::setupActions()
 {
     KStandardAction::quit(kapp, SLOT(quit()),
                           actionCollection());
 
     KStandardAction::open(this, SLOT(openFile()),
                           actionCollection());
 
     KStandardAction::save(this, SLOT(saveFile()),
                           actionCollection());
 
     KStandardAction::saveAs(this, SLOT(saveFileAs()),
                             actionCollection());
 
     KStandardAction::openNew(this, SLOT(newFile()),
                              actionCollection());
 }
 
 void KRichTextEditor::cursorPositionChanged()
 {
 // Show link target in status bar
     if (textArea->textCursor().charFormat().isAnchor()) {
         QString text = textArea->currentLinkText();
         QString url = textArea->currentLinkUrl();
         statusBar()->changeItem(text + " -> " + url, 0);
     } else {
         statusBar()->changeItem(QString(), 0);
     }
 }
 
 void KRichTextEditor::newFile()
 {
 //maybeSave
     fileName.clear();
     textArea->clear();
 }
 
 void KRichTextEditor::saveFileAs(const QString &outputFileName)
 {
     KSaveFile file(outputFileName);
     file.open();
 
     QByteArray outputByteArray;
     outputByteArray.append(textArea->toHtml().toUtf8());
     file.write(outputByteArray);
     file.finalize();
     file.close();
 
     fileName = outputFileName;
 }
 
 void KRichTextEditor::saveFileAs()
 {
     saveFileAs(KFileDialog::getSaveFileName());
 }
 
 void KRichTextEditor::saveFile()
 {
     if (!fileName.isEmpty()) {
         saveFileAs(fileName);
     } else {
         saveFileAs();
     }
 }
 
 void KRichTextEditor::openFile()
 {
     QString fileNameFromDialog = KFileDialog::getOpenFileName();
     if (fileNameFromDialog.isEmpty()) {
         return;
     }
 
     QString tmpFile;
     if (KIO::NetAccess::download(fileNameFromDialog, tmpFile,
                                  this)) {
         QFile file(tmpFile);
         file.open(QIODevice::ReadOnly);
         textArea->setTextOrHtml(QTextStream(&file).readAll());
         fileName = fileNameFromDialog;
 
         KIO::NetAccess::removeTempFile(tmpFile);
     } else {
         KMessageBox::error(this,
                            KIO::NetAccess::lastErrorString());
     }
 
 }
diff --git a/kpimtextedit/richtextbuilders/krichtexteditor.h b/kpimtextedit/richtextbuilders/krichtexteditor.h
index e53dfa672..f9dcc5b22 100644
--- a/kpimtextedit/richtextbuilders/krichtexteditor.h
+++ b/kpimtextedit/richtextbuilders/krichtexteditor.h
@@ -1,63 +1,65 @@
 /**
  * KDE Rich Text Editor
  *
  * Copyright 2008  Stephen Kelly <steveire@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301  USA
  */
 
 #ifndef KRICHTEXTEDITOR_H
 #define KRICHTEXTEDITOR_H
 
 #include <KRichTextWidget>
 
 #include <kxmlguiwindow.h>
 
 //@cond PRIVATE
 
 /**
  * @internal
  * Test window for testing KRichTextWidget
  */
 class KRichTextEditor : public KXmlGuiWindow
 {
     Q_OBJECT
 public:
     KRichTextEditor();
     ~KRichTextEditor();
 
     void setupActions();
 
 private slots:
     void newFile();
     void openFile();
     void saveFile();
     void saveFileAs();
     void saveFileAs(const QString &outputFileName);
     void cursorPositionChanged();
     void updateDockedWidgets();
 
 private:
     KRichTextWidget *textArea;
     KTextEdit *kte;
     KTextEdit *krte;
     KTextEdit *kpte;
+    KTextEdit *kbbte;
+    KTextEdit *kmwte;
     QString fileName;
 };
 
 //@endcond
 
 #endif
diff --git a/kpimtextedit/richtextbuilders/markupdirector.cpp b/kpimtextedit/richtextbuilders/markupdirector.cpp
index 70006559e..a748d183a 100755
--- a/kpimtextedit/richtextbuilders/markupdirector.cpp
+++ b/kpimtextedit/richtextbuilders/markupdirector.cpp
@@ -1,479 +1,474 @@
 /*
     This file is part of KDE.
 
     Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 
 #include <kdebug.h>
 
 #include "markupdirector.h"
 #include "abstractmarkupbuilder.h"
 #include <QTextDocument>
 #include <QTextDocumentFragment>
 #include <QString>
 #include <QTextFrame>
 #include <QTextTable>
 #include <QTextList>
 #include <QTextCursor>
 #include <QTextCharFormat>
 #include <QMap>
 #include <QColor>
 #include <QBrush>
 
 
 //@cond PRIVATE
 
 /**
  * @internal
  * Maintainability class for MarkupDirector
  */
 class MarkupDirector::Private
 {
     public:
         Private(MarkupDirector *md): q(md)
         {
         }
 
         MarkupDirector *q;
         AbstractMarkupBuilder *builder;
 };
 
 //@endcond
 
 
 MarkupDirector::MarkupDirector(AbstractMarkupBuilder* builder):
     d(new Private(this))
 {
     d->builder = builder;
 }
 
 MarkupDirector::~MarkupDirector()
 {
     delete d;
 }
 
 void MarkupDirector::processDocumentContents(QTextFrame::iterator start, QTextFrame::iterator end)
 {
 
     for (QTextFrame::iterator it = start; ((!it.atEnd()) && (it != end)); ++it)
     {
         QTextFrame *frame = it.currentFrame();
         if (frame)
         {
             QTextTable *table = dynamic_cast<QTextTable*>(frame);
             if (table)
             {
                 processTable(table);
             } else {
                 processFrame(frame);
             }
         } else {
             processBlock(it.currentBlock());
         }
     }
 }
 
 void MarkupDirector::processFrame(QTextFrame* frame)
 {
     processDocumentContents(frame->begin(), frame->end());
 }
 
 void MarkupDirector::processBlock(const QTextBlock &block)
 {
     if(block.isValid())
     {
         QTextList *list = block.textList();
         if (list)
         {
             // Just skip over if not the first item in a list.
             if ((list->item(0) == block) && (!block.previous().textList()))
             {
                 processList(block);
             }
         } else {
             processBlockContents(block);
         }
     }
 }
 
 void MarkupDirector::processTable(QTextTable *table)
 {
     QTextTableFormat format = table->format();
     QVector<QTextLength> colLengths = format.columnWidthConstraints();
 
-
     QTextLength tableWidth = format.width();
     QString sWidth;
 
-    kDebug() <<tableWidth.type() ;
-    
     if (tableWidth.type() == QTextLength::PercentageLength)
     {
         sWidth = "%1%";
         sWidth = sWidth.arg(tableWidth.rawValue());
     } else if (tableWidth.type() == QTextLength::FixedLength)
     {
         sWidth = "%1";
         sWidth = sWidth.arg(tableWidth.rawValue());
     }
-    
+
     d->builder->beginTable(format.cellPadding(), format.cellSpacing(), sWidth);
 
     int headerRowCount = format.headerRowCount();
 
     QList<QTextTableCell> alreadyProcessedCells;
-    
+
     for (int row = 0; row < table->rows(); ++row) {
         // Put a thead element around here somewhere?
         // if (row < headerRowCount)
         // {
             // d->builder->beginTableHeader();
         // }
 
         d->builder->beginTableRow();
 
         // Header attribute should really be on cells, not determined by number of rows.
         //http://www.webdesignfromscratch.com/html-tables.cfm
 
 
         for (int column = 0; column < table->columns(); ++column) {
 
             // TODO: Cells should support alignment.
 
 
             QTextTableCell tableCell = table->cellAt(row, column);
 
             int columnSpan = tableCell.columnSpan();
             int rowSpan = tableCell.rowSpan();
             if ((rowSpan > 1) || (columnSpan >1))
             {
                 if (alreadyProcessedCells.contains(tableCell))
                 {
                     // Already processed this cell. Move on.
                     continue;
                 } else {
                     alreadyProcessedCells.append(tableCell);
                 }
             }
 
             QTextLength cellWidth = colLengths.at(column);
 
             QString sCellWidth;
 
             if (cellWidth.type() == QTextLength::PercentageLength)
             {
                 sCellWidth = "%1%";
                 sCellWidth = sCellWidth.arg(cellWidth.rawValue());
             } else if (cellWidth.type() == QTextLength::FixedLength)
             {
                 sCellWidth = "%1";
                 sCellWidth = sCellWidth.arg(cellWidth.rawValue());
             }
-            
+
+            // TODO: Use THEAD instead
             if (row < headerRowCount)
             {
                 d->builder->beginTableHeaderCell( sCellWidth, columnSpan, rowSpan );
             } else {
                 d->builder->beginTableCell( sCellWidth, columnSpan, rowSpan );
             }
 
             processTableCell(tableCell);
 
             if (row < headerRowCount)
             {
                 d->builder->endTableHeaderCell();
             } else {
                 d->builder->endTableCell();
             }
         }
         d->builder->endTableRow();
     }
     d->builder->endTable();
 }
 
 void MarkupDirector::processTableCell(const QTextTableCell &cell)
 {
     processDocumentContents(cell.begin(), cell.end());
 }
 
 void MarkupDirector::processList(const QTextBlock &ablock)
 {
     QTextBlock block(ablock);
 
     QTextList *list = block.textList();
     if (!list)
     {
         return;
     }
 
     QList<QTextList*> lists;
 
     while (block.isValid() && block.textList())
     {
         if (list->item(0) == block)
         {
             // Item zero in a list is the first block in the list of blocks that make up a list.
             QTextListFormat::Style style = list->format().style();
             d->builder->beginList(style);
 
             lists.append(list);
         }
-        
+
         d->builder->beginListItem();
         processBlockContents(block);
         d->builder->endListItem();
 
         block = block.next();
 
         if (block.isValid())
         {
             QTextList *newList = block.textList();
-            
+
             if (!newList)
             {
                 while (!lists.isEmpty())
                 {
                     lists.removeLast();
                     d->builder->endList();
                 }
             } else if (newList == list)
             {
                 //Next block is on the same list; Handled on next iteration.
                 continue;
             }
-            else if (newList != list) 
+            else if (newList != list)
             {
                 if (newList->item(0) == block){
                     list = newList;
                     continue;
                 } else {
                     while (!lists.isEmpty())
                     {
                         if (block.textList() != lists.last())
                         {
                             lists.removeLast();
                             d->builder->endList();
                         } else {
                             break;
                         }
                     }
                     continue;
                 }
             }
         } else {
             // Next block is not valid. Maybe at EOF. Close all open lists.
             while (!lists.isEmpty())
             {
                 lists.removeLast();
                 d->builder->endList();
             }
         }
     }
 }
 
 void MarkupDirector::processBlockContents(const QTextBlock &block)
 {
     QTextBlockFormat blockFormat = block.blockFormat();
     Qt::Alignment blockAlignment = blockFormat.alignment();
 
-    
+    // TODO: decide when to use <h1> etc.
+
     if (blockFormat.hasProperty(QTextFormat::BlockTrailingHorizontalRulerWidth)) {
         d->builder->insertHorizontalRule();
         return;
     }
-    
+
     if(block.length() == 1 )
     {
         // If the length is one, it is only the newline and the block is empty.
         // TODO: Find a better way of determining this.
         d->builder->addNewline();
 
     } else {
 
-        qreal bottomMargin = blockFormat.bottomMargin();
-        qreal topMargin = blockFormat.topMargin();
-        
-        if ((bottomMargin != QTextBlockFormat().bottomMargin())
-             && (topMargin != QTextBlockFormat().topMargin()))
-        {
-            d->builder->beginParagraph(blockAlignment);
-        } else {
-            d->builder->beginParagraph(blockAlignment, topMargin, bottomMargin);
-        }
+        d->builder->beginParagraph( blockAlignment,
+                                    blockFormat.topMargin(),
+                                    blockFormat.bottomMargin(),
+                                    blockFormat.leftMargin(),
+                                    blockFormat.rightMargin()
+        );
 
         QTextBlock::iterator it;
         for (it = block.begin(); !it.atEnd(); ++it )
         {
             QTextFragment currentFragment = it.fragment();
             if (currentFragment.isValid())
             {
                 processFragment(currentFragment);
             }
         }
 
         d->builder->endParagraph();
     }
 }
 
 void MarkupDirector::processFragment(const QTextFragment &fragment)
 {
     QTextCharFormat fragmentFormat = fragment.charFormat();
 
     if (fragmentFormat.isImageFormat()) {
         QTextImageFormat imageFormat = fragmentFormat.toImageFormat();
         d->builder->insertImage(imageFormat.name(), imageFormat.width(), imageFormat.height());
     } else {
         int fontWeight = fragmentFormat.fontWeight();
         bool fontItalic = fragmentFormat.fontItalic();
         bool fontUnderline = fragmentFormat.fontUnderline();
         bool fontStrikeout = fragmentFormat.fontStrikeOut();
-        
+
         QBrush fontForeground = fragmentFormat.foreground();
         QBrush fontBackground = fragmentFormat.background();
-        
+
         QString fontFamily = fragmentFormat.fontFamily();
         int fontPointSize = fragmentFormat.font().pointSize();
         QString anchorHref = fragmentFormat.anchorHref();
 
         QTextCharFormat::VerticalAlignment vAlign = fragmentFormat.verticalAlignment();
         bool superscript = (vAlign == QTextCharFormat::AlignSuperScript);
         bool subscript = (vAlign == QTextCharFormat::AlignSubScript);
 
         if (superscript)
         {
             d->builder->beginSuperscript();
         }
 
         if (subscript)
         {
             d->builder->beginSubscript();
         }
 
         if (!anchorHref.isEmpty())
         {
-            d->builder->beginAnchor(anchorHref);
+            d->builder->beginLinkedAnchor(anchorHref);
         }
 
         if (fontWeight == QFont::Bold)
         {
             d->builder->beginStrong();
         }
 
         if (fontItalic)
         {
             d->builder->beginEmph();
         }
 
         if (fontUnderline)
         {
             d->builder->beginUnderline();
         }
 
         if (fontStrikeout)
         {
             d->builder->beginStrikeout();
         }
-        
+
         if (fontForeground != Qt::NoBrush)
         {
             d->builder->beginForeground(fontForeground);
         }
-        
+
         if (fontBackground != Qt::NoBrush)
         {
             // QTextCharFormat::background() returns a Qt::NoBrush brush if it hasn't been set
-            // explicitly by the user. 
+            // explicitly by the user.
             d->builder->beginBackground(fontBackground);
         }
-        
+
         if (!fontFamily.isEmpty()){
             // This is empty if it has not been set explicitly by the user.
             d->builder->beginFontFamily(fontFamily);
         }
 
         if (QTextCharFormat().font().pointSize() != fontPointSize)
         {
             d->builder->beginFontPointSize(fontPointSize);
         }
-        
+
         d->builder->appendLiteralText(fragment.text());
 
         if (QTextCharFormat().font().pointSize() != fontPointSize)
         {
             d->builder->endFontPointSize();
         }
-        
+
         if (!fontFamily.isEmpty()){
             d->builder->endFontFamily();
         }
-        
+
         if (fontBackground != Qt::NoBrush)
         {
             d->builder->endBackground();
         }
 
         if (fontForeground != Qt::NoBrush)
         {
             d->builder->endForeground();
         }
-        
+
         if (fontStrikeout)
         {
             d->builder->endStrikeout();
         }
 
         if (fontUnderline)
         {
             d->builder->endUnderline();
         }
 
         if (fontItalic)
         {
             d->builder->endEmph();
         }
 
         if (fontWeight == QFont::Bold)
         {
             d->builder->endStrong();
         }
-            
+
         if (!anchorHref.isEmpty())
         {
             d->builder->endAnchor();
         }
 
-        
+
         if (subscript)
         {
             d->builder->endSubscript();
         }
 
         if (superscript)
         {
             d->builder->endSuperscript();
         }
-        
+
     }
 }
 
 void MarkupDirector::constructContent(QTextDocument* doc)
 {
     QTextFrame *rootFrame = doc->rootFrame();
     processFrame(rootFrame);
 }
diff --git a/kpimtextedit/richtextbuilders/markupdirector.h b/kpimtextedit/richtextbuilders/markupdirector.h
index 42277f7ec..0aab823d7 100755
--- a/kpimtextedit/richtextbuilders/markupdirector.h
+++ b/kpimtextedit/richtextbuilders/markupdirector.h
@@ -1,149 +1,158 @@
 /*
     This file is part of KDE.
 
     Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 
 #ifndef MARKUPDIRECTOR_H
 #define MARKUPDIRECTOR_H
 
 
 #include "abstractmarkupbuilder.h"
 #include <QTextDocument>
 class QTextFrame;
 class QTextTable;
 class QTextTableCell;
 class QTextList;
 class QTextCharFormat;
 
 /**
 @brief The Markupdirector class controls and instructs a builder object to create markup output.
 
 The MarkupDirector is used with a subclass of AbstractMarkupBuilder to create a marked up document output.
 
 Usage can be quite simple.
 
-    QTextDocument *doc = editor->document(); // editor is a KRichTextWidget
+@code
+
+    QTextDocument *doc = editor->document(); // editor is a QTextEdit
 
     AbstractMarkupBuilder *builder = new HTMLBuilder();
     MarkupDirector *md = new MarkupDirector(builder);
     md->constructContent(doc);
     browser.setHtml(builder->getResult()); // browser is a QTextBrowser.
 
+@endcode
+
 Or with a different builder:
 
+@code
     AbstractMarkupBuilder *builder = new PlainTextMarkupBuilder();
     MarkupDirector *md = new MarkupDirector(builder);
     md->constructContent(doc);
     browser.setPlainText(builder->getResult());
-
+@endcode
 
 @todo Move this to kdelibs when tested and prooven.
 
 @author Stephen Kelly <steveire@gmail.com>
 @since 4.2
 
 */
 class MarkupDirector
 {
 public:
     /**
     Construct a new MarkupDirector
     */
     MarkupDirector(AbstractMarkupBuilder* builder);
-    
+
     /** Destructor */
     virtual ~MarkupDirector();
 
     /**
     Constructs the output by directing the builder to create the markup.
     */
     virtual void constructContent(QTextDocument* doc);
 
 protected:
-    
+
     /**
     Processes the frame by iterating over its child frames and blocks and processing them as needed.
     */
     void processFrame(QTextFrame *frame);
-    
-    /** 
+
+    /**
     Processes the table by iterating over its rows and columns, processing their contents.
     */
     void processTable(QTextTable *table);
 
-    /** 
+    /**
     Processes the table cell by iterating over its contents. May contain another table, nested list etc.
      */
     void processTableCell(const QTextTableCell &cell);
-    
+
     /**
         Processes a list by iterating over it. Nested lists are processed by a recursive call.
         @param block The first block in a list.
     */
     void processList(const QTextBlock &block);
-    
+
     /**
     Processes the contents of a QTextBlock. The block is traversed and each QTextFragment is processed individually.
-    
-    A QTextFragment is a fragment of continuous text with the continuous formatting.
-    
-    Eg, a block of text represented by 
+
+    A QTextFragment is a fragment of continuous text with continuous formatting.
+
+    Eg, a block of text represented by
+
+    @code
         Some long <b>formatted paragraph</b> of several pieces <b><i>of decorated</i> text</b> .
-        
-        would contain the fragments
-            * Some long
-            * formatteed paragraph
-            * of several pieces
-            * of decorated
-            * text
-    
-    @param The block to process.
+    @endcode
+
+    would contain the fragments
+
+    @li Some long
+    @li formatted paragraph
+    @li of several pieces
+    @li of decorated
+    @li text
+
+    @param block The block to process.
     */
     void processBlockContents(const QTextBlock &block);
-    
-    /** 
+
+    /**
     Processes the document between the iterators @p start and @p end inclusive.
     */
     void processDocumentContents(QTextFrame::iterator start, QTextFrame::iterator end);
-    
+
     /**
         Process a block.
 
         Note: If block is the first item in a list, the entire (maybe nested) list will be processed.
-        If block is part of a nested list, but not the first item, it is ignored.
+        If block is part of a nested list, but is not the first item, it is ignored.
         @param block The block to process.
     */
 
     void processBlock(const QTextBlock &block);
-    
+
     /**
-    Processes a QTextFragment. 
-    
+    Processes a QTextFragment.
+
     @param The fragment to process.
     */
     void processFragment(const QTextFragment &fragment);
 
 private:
     class Private;
     friend class Private;
     Private *const d;
 };
 
 #endif
diff --git a/kpimtextedit/richtextbuilders/mediawikimarkupbuilder.cpp b/kpimtextedit/richtextbuilders/mediawikimarkupbuilder.cpp
new file mode 100755
index 000000000..4ccc8b7c5
--- /dev/null
+++ b/kpimtextedit/richtextbuilders/mediawikimarkupbuilder.cpp
@@ -0,0 +1,120 @@
+/*
+    This file is part of KDE.
+
+    Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+
+
+#include "mediawikimarkupbuilder.h"
+#include <kdebug.h>
+
+MediaWikiMarkupBuilder::MediaWikiMarkupBuilder() {}
+MediaWikiMarkupBuilder::~MediaWikiMarkupBuilder() {}
+
+void MediaWikiMarkupBuilder::beginStrong() { m_text.append("'''"); }
+void MediaWikiMarkupBuilder::endStrong() { m_text.append("'''"); }
+void MediaWikiMarkupBuilder::beginEmph() { m_text.append("''"); }
+void MediaWikiMarkupBuilder::endEmph() { m_text.append("''"); }
+void MediaWikiMarkupBuilder::beginUnderline() { m_text.append("<u>"); }
+void MediaWikiMarkupBuilder::endUnderline() { m_text.append("</u>"); }
+void MediaWikiMarkupBuilder::beginStrikeout() { m_text.append("<s>"); }
+void MediaWikiMarkupBuilder::endStrikeout() { m_text.append("</s>"); }
+
+void MediaWikiMarkupBuilder::endParagraph() { m_text.append("\n"); }
+void MediaWikiMarkupBuilder::addNewline() { m_text.append("\n"); }
+
+void MediaWikiMarkupBuilder::beginAnchor(const QString &href, const QString &name) {
+    Q_UNUSED(name);
+    m_text.append(QString("[%1 ").arg(href));
+}
+void MediaWikiMarkupBuilder::endAnchor() { m_text.append("]"); }
+
+void MediaWikiMarkupBuilder::beginHeader1() { m_text.append("= "); }
+void MediaWikiMarkupBuilder::beginHeader2() { m_text.append("== "); }
+void MediaWikiMarkupBuilder::beginHeader3() { m_text.append("=== "); }
+void MediaWikiMarkupBuilder::beginHeader4() { m_text.append("==== "); }
+void MediaWikiMarkupBuilder::beginHeader5() { m_text.append("===== "); }
+void MediaWikiMarkupBuilder::beginHeader6() { m_text.append("====== "); }
+
+void MediaWikiMarkupBuilder::endHeader1() { m_text.append(" =\n"); }
+void MediaWikiMarkupBuilder::endHeader2() { m_text.append(" ==\n"); }
+void MediaWikiMarkupBuilder::endHeader3() { m_text.append(" ===\n"); }
+void MediaWikiMarkupBuilder::endHeader4() { m_text.append(" ====\n"); }
+void MediaWikiMarkupBuilder::endHeader5() { m_text.append(" =====\n"); }
+void MediaWikiMarkupBuilder::endHeader6() { m_text.append(" ======\n"); }
+
+void MediaWikiMarkupBuilder::beginList(QTextListFormat::Style type) {
+    currentListItemStyles.append(type);
+    switch(type){
+    case QTextListFormat::ListDisc:
+    case QTextListFormat::ListCircle:
+    case QTextListFormat::ListSquare:
+    case QTextListFormat::ListDecimal:
+    case QTextListFormat::ListLowerAlpha:
+    case QTextListFormat::ListUpperAlpha:
+        m_text.append("\n");
+        break;
+    default:
+        break;
+    }
+}
+
+
+
+void MediaWikiMarkupBuilder::endList() {
+    m_text.append("\n");
+    currentListItemStyles.removeLast();
+}
+
+
+void MediaWikiMarkupBuilder::beginListItem() {
+
+    switch( currentListItemStyles.last() )
+    {
+    case QTextListFormat::ListDisc:
+    case QTextListFormat::ListCircle:
+    case QTextListFormat::ListSquare:
+        m_text.append("* "); // Unordered lists are all disc type in MediaWikiMarkup.
+        break;
+    case QTextListFormat::ListDecimal:
+    case QTextListFormat::ListLowerAlpha:
+    case QTextListFormat::ListUpperAlpha:
+        m_text.append("# ");
+        break;
+    default:
+        break;
+    }
+}
+void MediaWikiMarkupBuilder::endListItem() { m_text.append("\n"); }
+
+
+void MediaWikiMarkupBuilder::appendLiteralText(const QString &text) { m_text.append(escape(text)); }
+
+const QString MediaWikiMarkupBuilder::escape(const QString &s)
+{
+    if ( s.contains( "<" ) ) // TODO: This could contain more. "''" and "[" for example
+    {
+        return QString( "<nowiki>" + s + "</nowiki>" );
+    }
+    return s;
+}
+
+QString& MediaWikiMarkupBuilder::getResult() { return m_text; }
+
+
diff --git a/kpimtextedit/richtextbuilders/mediawikimarkupbuilder.h b/kpimtextedit/richtextbuilders/mediawikimarkupbuilder.h
new file mode 100755
index 000000000..a817e1349
--- /dev/null
+++ b/kpimtextedit/richtextbuilders/mediawikimarkupbuilder.h
@@ -0,0 +1,92 @@
+/*
+    This file is part of KDE.
+
+    Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+
+
+#include "abstractmarkupbuilder.h"
+#include <kdebug.h>
+
+
+/**
+    @brief Creates MediaWiki markup from a QTextDocument
+*/
+class MediaWikiMarkupBuilder : public AbstractMarkupBuilder
+{
+public:
+
+    /**
+Creates a new MediaWikiMarkupBuilder
+    */
+    MediaWikiMarkupBuilder();
+    virtual ~MediaWikiMarkupBuilder();
+
+    virtual void beginStrong();
+    virtual void endStrong();
+    virtual void beginEmph();
+    virtual void endEmph();
+    virtual void beginUnderline();
+    virtual void endUnderline();
+    virtual void beginStrikeout();
+    virtual void endStrikeout();
+
+    virtual void endParagraph();
+    virtual void addNewline();
+
+    virtual void beginAnchor(const QString &href, const QString &name);
+    virtual void endAnchor();
+
+    virtual void beginHeader1();
+    virtual void beginHeader2();
+    virtual void beginHeader3();
+    virtual void beginHeader4();
+    virtual void beginHeader5();
+    virtual void beginHeader6();
+
+    virtual void endHeader1();
+    virtual void endHeader2();
+    virtual void endHeader3();
+    virtual void endHeader4();
+    virtual void endHeader5();
+    virtual void endHeader6();
+
+    virtual void beginList(QTextListFormat::Style type);
+
+
+
+    virtual void endList();
+
+
+    virtual void beginListItem();
+    virtual void endListItem();
+
+
+    virtual void appendLiteralText(const QString &text);
+
+    const QString escape(const QString &s);
+
+    virtual QString& getResult();
+
+private:
+    QList<QTextListFormat::Style> currentListItemStyles;
+
+    QString m_text;
+};
+
diff --git a/kpimtextedit/richtextbuilders/plaintextmarkupbuilder.cpp b/kpimtextedit/richtextbuilders/plaintextmarkupbuilder.cpp
new file mode 100644
index 000000000..54208e288
--- /dev/null
+++ b/kpimtextedit/richtextbuilders/plaintextmarkupbuilder.cpp
@@ -0,0 +1,164 @@
+/*
+    This file is part of KDE.
+
+    Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "plaintextmarkupbuilder.h"
+
+PlainTextMarkupBuilder::PlainTextMarkupBuilder()
+{
+    m_urls = QStringList();
+}
+
+void PlainTextMarkupBuilder::beginStrong() { m_text.append("*"); }
+void PlainTextMarkupBuilder::endStrong() { m_text.append("*"); }
+void PlainTextMarkupBuilder::beginEmph() { m_text.append("/"); }
+void PlainTextMarkupBuilder::endEmph() { m_text.append("/"); }
+void PlainTextMarkupBuilder::beginUnderline() { m_text.append("_"); }
+void PlainTextMarkupBuilder::endUnderline() { m_text.append("_"); }
+void PlainTextMarkupBuilder::beginStrikeout() { m_text.append("-"); }
+void PlainTextMarkupBuilder::endStrikeout() { m_text.append("-"); }
+
+void PlainTextMarkupBuilder::beginLinkedAnchor(const QString &href) {
+    if(!m_urls.contains(href)){
+
+        m_urls.append(href);
+    }
+    activeLink = href;
+}
+
+void PlainTextMarkupBuilder::endAnchor() {
+    m_text.append(QString("[%1]").arg(m_urls.indexOf(activeLink) + 1));
+}
+
+void PlainTextMarkupBuilder::endParagraph() { m_text.append("\n"); }
+void PlainTextMarkupBuilder::addNewline() { m_text.append("\n"); }
+void PlainTextMarkupBuilder::insertImage(const QString &src, qreal width, qreal height) {
+    Q_UNUSED(width)
+    Q_UNUSED(height)
+
+    if(!m_urls.contains(src)){
+        m_urls.append(src);
+    }
+    m_text.append(QString("[%1]").arg(m_urls.indexOf(src) + 1));
+}
+
+
+void PlainTextMarkupBuilder::beginList(QTextListFormat::Style style) {
+    currentListItemStyles.append(style);
+    currentListItemNumbers.append(0);
+}
+
+void PlainTextMarkupBuilder::endList() {
+    if (!currentListItemNumbers.isEmpty())
+    {
+        currentListItemStyles.removeLast();
+        currentListItemNumbers.removeLast();
+    }
+}
+void PlainTextMarkupBuilder::beginListItem() {
+    for (int i = 0; i < currentListItemNumbers.size(); i++){
+        m_text.append("    ");
+    }
+
+    int itemNumber = currentListItemNumbers.last();
+    QString letterString;
+
+    switch(currentListItemStyles.last()){
+    case QTextListFormat::ListDisc:
+        m_text.append(" *  ");
+        break;
+    case QTextListFormat::ListCircle:
+        m_text.append(" o  ");
+        break;
+    case QTextListFormat::ListSquare:
+        m_text.append(" -  ");
+        break;
+    case QTextListFormat::ListDecimal:
+        m_text.append(QString(" %1. ").arg(itemNumber +1));
+        break;
+    case QTextListFormat::ListLowerAlpha:
+        m_text.append(QString(" %1. ").arg(getLetterString(itemNumber)));
+        break;
+    case QTextListFormat::ListUpperAlpha:
+        m_text.append(QString(" %1. ").arg(getLetterString(itemNumber).toUpper()));
+        break;
+    default:
+        break;
+    }
+}
+
+QString PlainTextMarkupBuilder::getLetterString(int itemNumber)
+{
+    QString letterString;
+    while (true)
+    {
+        // Create the letter string by prepending one char at a time.
+        // The itemNumber is converted to a number in the base 36 (number of letters in the
+        // alphabet plus 10) after being increased by 10 (to pass out the digits 0 to 9).
+        letterString.prepend(QString("%1").arg((itemNumber % LETTERSINALPHABET) + DIGITSOFFSET,
+                0, // no padding while building this string.
+                LETTERSINALPHABET + DIGITSOFFSET));
+        if( (itemNumber >= LETTERSINALPHABET)  )
+        {
+            itemNumber = itemNumber / LETTERSINALPHABET;
+            itemNumber--;
+        } else {
+            break;
+        }
+    }
+    return letterString;
+}
+
+
+void PlainTextMarkupBuilder::endListItem() {
+    currentListItemNumbers.last() = currentListItemNumbers.last() +1;
+}
+
+
+void PlainTextMarkupBuilder::beginSuperscript() { m_text.append("^{"); }
+
+void PlainTextMarkupBuilder::endSuperscript() { m_text.append("}"); }
+
+void PlainTextMarkupBuilder::beginSubscript() { m_text.append("_{"); }
+
+void PlainTextMarkupBuilder::endSubscript() { m_text.append("}"); }
+
+void PlainTextMarkupBuilder::appendLiteralText(const QString &text ) { m_text.append(text); }
+
+QString& PlainTextMarkupBuilder::getResult() {
+    QString &ret = m_text;
+    ret.append(getReferences());
+    return ret;
+}
+
+QString PlainTextMarkupBuilder::getReferences() {
+    QString refs;
+    if (!m_urls.isEmpty())
+    {
+        refs.append("\n---- References ----\n"); //TODO: i18n
+
+        int index = 1;
+        while (!m_urls.isEmpty())
+        {
+            refs.append(QString("[%1] %2\n").arg(index++).arg(m_urls.takeFirst()));
+        }
+    }
+    return refs;
+}
diff --git a/kpimtextedit/richtextbuilders/plaintextmarkupbuilder.h b/kpimtextedit/richtextbuilders/plaintextmarkupbuilder.h
index 9aaf1230c..8080a5b58 100755
--- a/kpimtextedit/richtextbuilders/plaintextmarkupbuilder.h
+++ b/kpimtextedit/richtextbuilders/plaintextmarkupbuilder.h
@@ -1,253 +1,167 @@
 /*
     This file is part of KDE.
 
     Copyright (c) 2008 Stephen Kelly <steveire@gmail.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #ifndef PLAINTEXTMARKUPBUILDER_H
 #define PLAINTEXTMARKUPBUILDER_H
 
 #define LETTERSINALPHABET 26
 #define DIGITSOFFSET 10
 
 #include <kdebug.h>
 
 #include "abstractmarkupbuilder.h"
 
 /**
 @brief The PlainTextMarkupBuilder creates a simple marked up plain text document.
 
-This class creates a simple plain text markup. 
+This class creates a simple plain text markup.
 
-Text that may be represented as 
+Text that may be represented as
 
+@code
     A paragraph with <b>bold</b> text, <i>italic</i> text, and <u>underlined</u> text.
-    
-would be output as 
+@endcode
 
+would be output as
+
+@code
     A paragraph with *bold* text /italic/ text, and _underlined_ text.
-    
+@endcode
+
 The markup is intended to be simple, plain and easily human readable. No markup is created for different font-familiy, font-size, foreground or background colors.
 
 Lists are marked up by preceeding the list element with '*' for disc, 'o' for circle, 'X' for square, or a letter or number. Lists are also indented if nested.
 eg:
 
+@code
     A. One
     B. Two
         o Three
         o Four
             * Five
             * Six
     C. Seven
+@endcode
 
 External references such as external urls and images are represented in the body text as a reference, and references are maintained at the bottom of the output.
 
 Eg,
-
+@code
         Here is a link to <a href="http://www.kde.org">KDE</a> and the <a href="http://pim.kde.org">KDEPIM project</a>.
+@endcode
 
 becomes:
 
+@code
     Here is a link to KDE[1], and the KDEPIM project[2].
 
     ---- References ----
     [1] http://www.kde.org
     [2] http://pim.kde.org
+@endcode
 
 @todo Move this to kdelibs when tested and in use.
 
 @author Stephen Kelly <steveire@gmail.com>
 @since 4.2
 
 */
 class PlainTextMarkupBuilder : public AbstractMarkupBuilder
 {
     public:
     /** Construct a new PlainTextMarkupBuilder. */
-    PlainTextMarkupBuilder() {
-        m_urls = QStringList();
-    }
-
-    virtual void beginStrong() { m_text.append("*"); }
-    virtual void endStrong() { m_text.append("*"); }
-    virtual void beginEmph() { m_text.append("/"); }
-    virtual void endEmph() { m_text.append("/"); }
-    virtual void beginUnderline() { m_text.append("_"); }
-    virtual void endUnderline() { m_text.append("_"); }
-    virtual void beginStrikeout() { m_text.append("-"); }
-    virtual void endStrikeout() { m_text.append("-"); }
-    
-    virtual void beginAnchor(const QString &href) {
-        if(!m_urls.contains(href)){
-
-            m_urls.append(href);
-        }
-        activeLink = href;
-    }
-
-    virtual void endAnchor() {
-        m_text.append(QString("[%1]").arg(m_urls.indexOf(activeLink) + 1));
-    }
-
-    virtual void endParagraph() { m_text.append("\n"); }
-    virtual void addNewline() { m_text.append("\n"); }
-    virtual void insertImage(const QString &src, qreal width, qreal height) {
-        Q_UNUSED(width)
-        Q_UNUSED(height)
-
-        if(!m_urls.contains(src)){
-            m_urls.append(src);
-        }
-        m_text.append(QString("[%1]").arg(m_urls.indexOf(src) + 1));
-    }
-
-
-    virtual void beginList(QTextListFormat::Style style) {
-        currentListItemStyles.append(style);
-        currentListItemNumbers.append(0);
-    }
-
-    virtual void endList() {
-        if (!currentListItemNumbers.isEmpty())
-        {
-            currentListItemStyles.removeLast();
-            currentListItemNumbers.removeLast();
-        }
-    }
-    virtual void beginListItem() {
-        for (int i = 0; i < currentListItemNumbers.size(); i++){
-            m_text.append("    ");
-        }
-
-        int itemNumber = currentListItemNumbers.last();
-        QString letterString;
-
-        switch(currentListItemStyles.last()){
-        case QTextListFormat::ListDisc:
-            m_text.append(" *  ");
-            break;
-        case QTextListFormat::ListCircle:
-            m_text.append(" o  ");
-            break;
-        case QTextListFormat::ListSquare:
-            m_text.append(" X  ");
-            break;
-        case QTextListFormat::ListDecimal:
-            m_text.append(QString(" %1. ").arg(itemNumber +1));
-            break;
-        case QTextListFormat::ListLowerAlpha:
-            m_text.append(QString(" %1. ").arg(getLetterString(itemNumber)));
-            break;
-        case QTextListFormat::ListUpperAlpha:
-            m_text.append(QString(" %1. ").arg(getLetterString(itemNumber).toUpper()));
-            break;
-        default:
-            break;
-        }
-    }
+    PlainTextMarkupBuilder();
+
+    virtual void beginStrong();
+    virtual void endStrong();
+    virtual void beginEmph();
+    virtual void endEmph();
+    virtual void beginUnderline();
+    virtual void endUnderline();
+    virtual void beginStrikeout();
+    virtual void endStrikeout();
+
+    virtual void beginLinkedAnchor(const QString &href);
+
+    virtual void endAnchor();
+
+    virtual void endParagraph();
+    virtual void addNewline();
+    virtual void insertImage(const QString &src, qreal width, qreal height);
+
+
+    virtual void beginList(QTextListFormat::Style style);
+
+    virtual void endList();
+
+    virtual void beginListItem();
 
     /**
     Get a letter string to represent a number.
-    
+
     The numbers 1-26 are represented by a-z, and 27-52 by aa-az, 53-79 by ba-bz etc.
-    
+
     @param The number to convert
-    @return The letter string representation of the number.    
+    @return The letter string representation of the number.
     */
-    QString getLetterString(int itemNumber)
-    {
-        QString letterString;
-        while (true)
-        {
-            // Create the letter string by prepending one char at a time.
-            // The itemNumber is converted to a number in the base 36 (number of letters in the
-            // alphabet plus 10) after being increased by 10 (to pass out the digits 0 to 9).
-            letterString.prepend(QString("%1").arg((itemNumber % LETTERSINALPHABET) + DIGITSOFFSET,
-                    0, // no padding while building this string.
-                    LETTERSINALPHABET + DIGITSOFFSET));
-            if( (itemNumber >= LETTERSINALPHABET)  )
-            {
-                itemNumber = itemNumber / LETTERSINALPHABET;
-                itemNumber--;
-            } else {
-                break;
-            }
-        }
-        return letterString;
-    }
-
-
-    virtual void endListItem() { 
-        currentListItemNumbers.last() = currentListItemNumbers.last() +1;
-    }
-
-    
-    virtual void beginSuperscript() { m_text.append("^{"); }
-
-    virtual void endSuperscript() { m_text.append("}"); }
-    
-    virtual void beginSubscript() { m_text.append("_{"); }
-    
-    virtual void endSubscript() { m_text.append("}"); }
-
-    virtual void appendLiteralText(const QString &text ) { m_text.append(text); }
+    QString getLetterString(int itemNumber);
+
+    virtual void endListItem();
+
+
+    virtual void beginSuperscript();
+
+    virtual void endSuperscript();
+
+    virtual void beginSubscript();
+
+    virtual void endSubscript();
+
+    virtual void appendLiteralText(const QString &text );
 
     /**
     Returns the finalised plain text markup, including references at the end.
     */
-    virtual QString& getResult() {
-        QString &ret = m_text;
-        ret.append(getReferences());
-        return ret;
-    }
+    virtual QString& getResult();
+
 
-    
 
 protected:
     /**
     Gets a block of references in the body of the text.
     This is an ordered list of links and images in the text.
     */
-    QString getReferences() {
-        QString refs;
-        if (!m_urls.isEmpty()){
-            refs.append("\n---- References ----\n"); //TODO: i18n
-
-            int index = 1;
-            while (!m_urls.isEmpty())
-            {
-                refs.append(QString("[%1] %2\n").arg(index++).arg(m_urls.takeFirst()));
-            }
-        }
-        return refs;
-    }
+    QString getReferences();
 
 private:
     QStringList m_urls;
-    
+
     // TODO: Make this a QList<QPair<QTextListFormat::Style, int>> instead
     QList<QTextListFormat::Style> currentListItemStyles;
     QList<int> currentListItemNumbers;
-    
+
     QString activeLink;
 
     QString m_text;
 
 };
 
 #endif