diff --git a/core/networkaccess.cpp b/core/networkaccess.cpp
index 6e1689d..2973a6c 100644
--- a/core/networkaccess.cpp
+++ b/core/networkaccess.cpp
@@ -289,7 +289,7 @@ void Core::NetworkAccess::onDownloadFinished()
             QStringList hops = url.split("/");
             QString fileName = hops.back();
             QStringList parts = fileName.split(".");
-            path = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
+            path = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + "/";
             QString suffix("");
             QString realName = parts.front();
             for (QStringList::const_iterator sItr = (parts.begin()++), sEnd = parts.end(); sItr != sEnd; ++sItr) {
diff --git a/ui/utils/message.cpp b/ui/utils/message.cpp
index eb4b608..1dc35b7 100644
--- a/ui/utils/message.cpp
+++ b/ui/utils/message.cpp
@@ -20,10 +20,11 @@
 #include <QMimeDatabase>
 #include <QPixmap>
 #include <QFileInfo>
+#include <QRegularExpression>
 #include "message.h"
 
-const QRegExp urlReg("(?!<img\\ssrc=\")((?:https?|ftp)://\\S+)");
-const QRegExp imgReg("((?:https?|ftp)://\\S+\\.(?:jpg|jpeg|png|svg|gif))");
+const QRegularExpression urlReg("(?<!<a\\shref=['\"])(?<!<img\\ssrc=['\"])((?:https?|ftp)://\\S+)");       //finds all hypertext references which are not wrapped in a or img tags
+const QRegularExpression imgReg("((?:https?|ftp)://\\S+\\.(?:jpg|jpeg|png|svg|gif))");
 
 Message::Message(const Shared::Message& source, bool outgoing, const QString& p_sender, QWidget* parent):
     QHBoxLayout(parent),
@@ -49,6 +50,7 @@ Message::Message(const Shared::Message& source, bool outgoing, const QString& p_
     QString bd = msg.getBody();
     //bd.replace(imgReg, "<img src=\"\\1\"/>");
     bd.replace(urlReg, "<a href=\"\\1\">\\1</a>");
+    text->setTextFormat(Qt::RichText);
     text->setText(bd);;
     text->setTextInteractionFlags(text->textInteractionFlags() | Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
     text->setWordWrap(true);