diff --git a/src/backends/R/rexpression.cpp b/src/backends/R/rexpression.cpp
index 5dc1768f..feaf1277 100644
--- a/src/backends/R/rexpression.cpp
+++ b/src/backends/R/rexpression.cpp
@@ -1,152 +1,156 @@
 /*
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program 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 General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2009 Alexander Rieder <alexanderrieder@gmail.com>
  */
 
 #include "rexpression.h"
 
 #include "textresult.h"
 #include "imageresult.h"
 #include "helpresult.h"
 #include "epsresult.h"
 #include "rsession.h"
 
 
 #include <QDebug>
 #include <KLocalizedString>
 #include <QMimeType>
 #include <QMimeDatabase>
 #include <QFile>
 #include <QStringList>
 #include <QTextDocument>
 
 RExpression::RExpression( Cantor::Session* session ) : Cantor::Expression(session)
 {
 
 }
 
 RExpression::~RExpression()
 {
 
 }
 
 void RExpression::evaluate()
 {
     setStatus(Cantor::Expression::Computing);
     if(command().startsWith(QLatin1Char('?')))
         m_isHelpRequest=true;
     else
         m_isHelpRequest=false;
 
     static_cast<RSession*>(session())->queueExpression(this);
 }
 
 void RExpression::interrupt()
 {
     qDebug()<<"interrupting command";
     if(status()==Cantor::Expression::Computing)
         session()->interrupt();
     setStatus(Cantor::Expression::Interrupted);
 }
 
 void RExpression::finished(int returnCode, const QString& text)
 {
     if(returnCode==RExpression::SuccessCode)
     {
         setResult(new Cantor::TextResult(Qt::convertFromPlainText(text)));
         setStatus(Cantor::Expression::Done);
     }else if (returnCode==RExpression::ErrorCode)
     {
         setResult(new Cantor::TextResult(Qt::convertFromPlainText(text)));
         setStatus(Cantor::Expression::Error);
         setErrorMessage(Qt::convertFromPlainText(text));
     }
 }
 
 void RExpression::evaluationStarted()
 {
     setStatus(Cantor::Expression::Computing);
 }
 
 void RExpression::addInformation(const QString& information)
 {
     static_cast<RSession*>(session())->sendInputToServer(information);
 }
 
 void RExpression::showFilesAsResult(const QStringList& files)
 {
     qDebug()<<"showing files: "<<files;
     foreach(const QString& file, files)
     {
         QMimeType type;
         QMimeDatabase db;
 
         type=db.mimeTypeForUrl(QUrl(file));
         qDebug()<<"MimeType: "<<type.name();
         if(type.inherits(QLatin1String("application/postscript")))
         {
             qDebug()<<"its PostScript";
             setResult(new Cantor::EpsResult(QUrl::fromLocalFile(file)));
-        } else if(type.inherits(QLatin1String("text/plain")))
+        }
+        else if(type.inherits(QLatin1String("text/plain")) 
+            || type.inherits(QLatin1String("application/x-extension-html")))
         {
             //Htmls are also plain texts, combining this in one
-            if(type.inherits(QLatin1String("text/html")))
+            const bool isHtml = type.inherits(QLatin1String("text/html"))
+                || type.inherits(QLatin1String("application/x-extension-html"));
+            if(isHtml)
                 qDebug()<<"its a HTML document";
             else
                 qDebug()<<"its plain text";
 
             QFile f(file);
             if (!f.open(QIODevice::ReadOnly | QIODevice::Text))
             {
                 setResult(new Cantor::TextResult(i18n("Error opening file %1", file)));
                 setErrorMessage(i18n("Error opening file %1", file));
                 setStatus(Cantor::Expression::Error);
             }
             QString content=QTextStream(&f).readAll();
-            if (!type.inherits(QLatin1String("text/html")))
+            if (!isHtml)
             {
                 //Escape whitespace
                 content.replace( QLatin1Char(' '), QLatin1String("&nbsp;"));
                 //replace appearing backspaces, as they mess the whole output up
                 content.remove(QRegExp(QLatin1String(".\b")));
                 //Replace <, > and & with their html code, so they won't be confused as html tags
                 content.replace( QLatin1Char('<') ,  QLatin1String("&lt;"));
                 content.replace( QLatin1Char('>') ,  QLatin1String("&gt;"));
                 content.replace( QLatin1Char('&') ,  QLatin1String("&amp;"));
             }
 
             qDebug()<<"content: "<<content;
             if(m_isHelpRequest)
                 setResult(new Cantor::HelpResult(content));
             else
                 setResult(new Cantor::TextResult(content));
 	    setStatus(Cantor::Expression::Done);
         }else if (type.name().contains(QLatin1String("image")))
         {
             setResult(new Cantor::ImageResult(QUrl::fromLocalFile(file)));
 	    setStatus(Cantor::Expression::Done);
         }
         else
         {
             setResult(new Cantor::TextResult(i18n("cannot open file %1: Unknown MimeType", file)));
             setErrorMessage(i18n("cannot open file %1: Unknown MimeType", file));
             setStatus(Cantor::Expression::Error);
         }
     }
 }