diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp
index 857b4dcfb75..e5e7918c1c5 100644
--- a/src/mumble/ConnectDialog.cpp
+++ b/src/mumble/ConnectDialog.cpp
@@ -356,7 +356,7 @@ ServerItem::~ServerItem() {
 		delete si;
 }
 
-ServerItem *ServerItem::fromMimeData(const QMimeData *mime, bool default_name, QWidget *p) {
+ServerItem *ServerItem::fromMimeData(const QMimeData *mime, bool default_name, QWidget *p, bool convertHttpUrls) {
 	if (mime->hasFormat(QLatin1String("OriginatedInMumble")))
 		return NULL;
 
@@ -378,18 +378,56 @@ ServerItem *ServerItem::fromMimeData(const QMimeData *mime, bool default_name, Q
 
 			url = QUrl::fromEncoded(qba, QUrl::StrictMode);
 			if (! url.isValid()) {
+				// Windows internet shortcut files (.url) are an ini with an URL value
 				QSettings qs(qsFile, QSettings::IniFormat);
 				url = QUrl::fromEncoded(qs.value(QLatin1String("InternetShortcut/URL")).toByteArray(), QUrl::StrictMode);
 			}
 		}
 	}
 
+	if (default_name) {
 #if QT_VERSION >= 0x050000
-	QUrlQuery query(url);
+		QUrlQuery query(url);
+		if (! query.hasQueryItem(QLatin1String("title"))) {
+			query.addQueryItem(QLatin1String("title"), url.host());
+		}
+#else
+		if (! url.hasQueryItem(QLatin1String("title"))) {
+			url.addQueryItem(QLatin1String("title"), url.host());
+		}
 #endif
+	}
 
-	if (! url.isValid() || (url.scheme() != QLatin1String("mumble")))
+	if (! url.isValid()) {
 		return NULL;
+	}
+
+	// An URL from text without a scheme will have the hostname text
+	// in the QUrl scheme and no hostname. We do not want to use that.
+	if (url.host().isEmpty()) {
+		return NULL;
+	}
+
+	// Some communication programs automatically create http links from domains.
+	// When a user sends another user a domain to connect to, and http is added wrongly,
+	// we do our best to remove it again.
+	if (convertHttpUrls && (
+	    url.scheme() == QLatin1String("http")
+	    || url.scheme() == QLatin1String("https"))) {
+		url.setScheme(QLatin1String("mumble"));
+	}
+
+	return fromUrl(url, p);
+}
+
+ServerItem *ServerItem::fromUrl(QUrl url, QWidget *p) {
+	if (! url.isValid() || (url.scheme() != QLatin1String("mumble"))) {
+		return NULL;
+	}
+
+#if QT_VERSION >= 0x050000
+	QUrlQuery query(url);
+#endif
 
 	if (url.userName().isEmpty()) {
 		if (g.s.qsUsername.isEmpty()) {
@@ -405,17 +443,11 @@ ServerItem *ServerItem::fromMimeData(const QMimeData *mime, bool default_name, Q
 	}
 
 #if QT_VERSION >= 0x050000
-	if (! query.hasQueryItem(QLatin1String("title")) && default_name)
-		query.addQueryItem(QLatin1String("title"), url.host());
-
 	ServerItem *si = new ServerItem(query.queryItemValue(QLatin1String("title")), url.host(), static_cast<unsigned short>(url.port(DEFAULT_MUMBLE_PORT)), url.userName(), url.password());
 
 	if (query.hasQueryItem(QLatin1String("url")))
 		si->qsUrl = query.queryItemValue(QLatin1String("url"));
 #else
-	if (! url.hasQueryItem(QLatin1String("title")) && default_name)
-		url.addQueryItem(QLatin1String("title"), url.host());
-
 	ServerItem *si = new ServerItem(url.queryItemValue(QLatin1String("title")), url.host(), static_cast<unsigned short>(url.port(DEFAULT_MUMBLE_PORT)), url.userName(), url.password());
 
 	if (url.hasQueryItem(QLatin1String("url")))
@@ -715,23 +747,56 @@ QIcon ServerItem::loadIcon(const QString &name) {
 	return qmIcons.value(name);
 }
 
-ConnectDialogEdit::ConnectDialogEdit(QWidget *p, const QString &name, const QString &host, const QString &user, unsigned short port, const QString &password, bool add) : QDialog(p) {
+ConnectDialogEdit::ConnectDialogEdit(QWidget *p, const QString &name, const QString &host, const QString &user, unsigned short port, const QString &password) : QDialog(p) {
 	setupUi(this);
-	if (add)
-		setWindowTitle(tr("Add Server"));
+	init();
 
-	qlePort->setValidator(new QIntValidator(1, 65535, qlePort));
+	bCustomLabel = ! name.simplified().isEmpty();
 
 	qleName->setText(name);
 	qleServer->setText(host);
-	qleUsername->setText(user.isEmpty() ? g.s.qsUsername : user);
+	qleUsername->setText(user);
 	qlePort->setText(QString::number(port));
-	qlePassword->setEchoMode(QLineEdit::Password);
 	qlePassword->setText(password);
 
+	validate();
+}
+
+ConnectDialogEdit::ConnectDialogEdit(QWidget *parent) : QDialog(parent) {
+	setupUi(this);
+	setWindowTitle(tr("Add Server"));
+	init();
+
+	if (!updateFromClipboard()) {
+		// If connected to a server assume the user wants to add it
+		if (g.sh && g.sh->isRunning()) {
+			QString host, name, user, pw;
+			unsigned short port = DEFAULT_MUMBLE_PORT;
+
+			g.sh->getConnectionInfo(host, port, user, pw);
+			Channel *c = Channel::get(0);
+			if (c && c->qsName != QLatin1String("Root")) {
+				name = c->qsName;
+			}
+
+			showNotice(tr("You are currently connected to a server.\nDo you want to fill the dialog with the connection data of this server?\nHost: %1 Port: %2").arg(host).arg(port));
+			m_si = new ServerItem(name, host, port, user, pw);
+		}
+	}
+	qleUsername->setText(g.s.qsUsername);
+}
+
+void ConnectDialogEdit::init() {
+	m_si = NULL;
 	usPort = 0;
 	bOk = true;
-	bCustomLabel = ! name.simplified().isEmpty();
+	bCustomLabel = false;
+
+	qwInlineNotice->hide();
+
+	qlePort->setValidator(new QIntValidator(1, 65535, qlePort));
+	qlePort->setText(QString::number(DEFAULT_MUMBLE_PORT));
+	qlePassword->setEchoMode(QLineEdit::Password);
 
 	connect(qleName, SIGNAL(textChanged(const QString &)), this, SLOT(validate()));
 	connect(qleServer, SIGNAL(textChanged(const QString &)), this, SLOT(validate()));
@@ -742,6 +807,53 @@ ConnectDialogEdit::ConnectDialogEdit(QWidget *p, const QString &name, const QStr
 	validate();
 }
 
+ConnectDialogEdit::~ConnectDialogEdit() {
+	delete m_si;
+}
+
+void ConnectDialogEdit::showNotice(const QString &text) {
+	QLabel *label = qwInlineNotice->findChild<QLabel *>(QLatin1String("qlPasteNotice"));
+	Q_ASSERT(label);
+	label->setText(text);
+	qwInlineNotice->show();
+	adjustSize();
+}
+
+bool ConnectDialogEdit::updateFromClipboard() {
+	delete m_si;
+	m_si = ServerItem::fromMimeData(QApplication::clipboard()->mimeData(), false, NULL, true);
+	bool hasServerData = m_si != NULL;
+	if (hasServerData) {
+		showNotice(tr("You have an URL in your clipboard.\nDo you want to fill the dialog with this data?\nHost: %1 Port: %2").arg(m_si->qsHostname).arg(m_si->usPort));
+		return true;
+	} else {
+		qwInlineNotice->hide();
+		adjustSize();
+		return false;
+	}
+}
+
+void ConnectDialogEdit::on_qbFill_clicked() {
+	Q_ASSERT(m_si);
+
+	qwInlineNotice->hide();
+	adjustSize();
+
+	qleName->setText(m_si->qsName);
+	qleServer->setText(m_si->qsHostname);
+	qleUsername->setText(m_si->qsUsername);
+	qlePort->setText(QString::number(m_si->usPort));
+	qlePassword->setText(m_si->qsPassword);
+
+	delete m_si;
+	m_si = NULL;
+}
+
+void ConnectDialogEdit::on_qbDiscard_clicked() {
+	qwInlineNotice->hide();
+	adjustSize();
+}
+
 void ConnectDialogEdit::on_qleName_textEdited(const QString& name) {
 	if (bCustomLabel) {
 		// If empty, then reset to automatic label.
@@ -1055,39 +1167,7 @@ void ConnectDialog::on_qaFavoriteAdd_triggered() {
 }
 
 void ConnectDialog::on_qaFavoriteAddNew_triggered() {
-	QString host, user, pw;
-	QString name;
-	unsigned short port = DEFAULT_MUMBLE_PORT;
-
-	// Try to fill out fields if possible
-	{
-		ServerItem *si = ServerItem::fromMimeData(QApplication::clipboard()->mimeData(), false);
-		if (si) {
-			// If there is server information in the clipboard assume user wants to add it
-			name = si->qsName;
-
-			if (! si->qsBonjourHost.isEmpty())
-				host = QLatin1Char('@') + si->qsBonjourHost;
-			else
-				host = si->qsHostname;
-
-			port = si->usPort;
-			pw = si->qsPassword;
-		} else {
-			// If connected to a server assume the user wants to add it
-			if (g.sh && g.sh->isRunning()) {
-				g.sh->getConnectionInfo(host, port, user, pw);
-				Channel *c = Channel::get(0);
-				if (c) {
-					if (c->qsName != QLatin1String("Root"))
-						name = c->qsName;
-				}
-			} else
-				user = g.s.qsUsername;
-		}
-	}
-
-	ConnectDialogEdit *cde = new ConnectDialogEdit(this, name, host, user, port, pw, true);
+	ConnectDialogEdit *cde = new ConnectDialogEdit(this);
 
 	if (cde->exec() == QDialog::Accepted) {
 		ServerItem *si = new ServerItem(cde->qsName, cde->qsHostname, cde->usPort, cde->qsUsername, cde->qsPassword);
diff --git a/src/mumble/ConnectDialog.h b/src/mumble/ConnectDialog.h
index 54b3f2a3b76..a2e94b8a9f7 100644
--- a/src/mumble/ConnectDialog.h
+++ b/src/mumble/ConnectDialog.h
@@ -174,7 +174,9 @@ class ServerItem : public QTreeWidgetItem, public PingStats {
 		/// @param p Parent widget to use in case the user has to be queried
 		/// @return Server item or NULL if mime data invalid.
 		///
-		static ServerItem *fromMimeData(const QMimeData *mime, bool default_name = true, QWidget *p = NULL);
+		static ServerItem *fromMimeData(const QMimeData *mime, bool default_name = true, QWidget *p = NULL, bool convertHttpUrls=false);
+		/// Create a ServerItem from a mumble:// URL
+		static ServerItem *fromUrl(QUrl url, QWidget *p);
 
 		void addServerItem(ServerItem *child);
 
@@ -196,26 +198,37 @@ class ConnectDialogEdit : public QDialog, protected Ui::ConnectDialogEdit {
 	private:
 		Q_OBJECT
 		Q_DISABLE_COPY(ConnectDialogEdit)
+
+		void init();
 	protected:
 		bool bOk;
 		bool bCustomLabel;
+		ServerItem *m_si;
+
 	public slots:
 		void validate();
 		void accept();
 
+		void on_qbFill_clicked();
+		void on_qbDiscard_clicked();
 		void on_qcbShowPassword_toggled(bool);
 		void on_qleName_textEdited(const QString&);
 		void on_qleServer_textEdited(const QString&);
+		void showNotice(const QString &text);
+		bool updateFromClipboard();
 	public:
 		QString qsName, qsHostname, qsUsername, qsPassword;
 		unsigned short usPort;
 		ConnectDialogEdit(QWidget *parent,
-		                  const QString &name = QString(),
-		                  const QString &host = QString(),
-		                  const QString &user = QString(),
-		                  unsigned short port = DEFAULT_MUMBLE_PORT,
-		                  const QString &password = QString(),
-		                  bool add = false);
+		                  const QString &name,
+		                  const QString &host,
+		                  const QString &user,
+		                  unsigned short port,
+		                  const QString &password);
+		/// Add a new Server
+		/// Prefills from clipboard content or the connected to server if available
+		ConnectDialogEdit(QWidget *parent);
+		virtual ~ConnectDialogEdit();
 };
 
 class ConnectDialog : public QDialog, public Ui::ConnectDialog {
diff --git a/src/mumble/ConnectDialogEdit.ui b/src/mumble/ConnectDialogEdit.ui
index dcf3a23ebc7..550d537e5c6 100644
--- a/src/mumble/ConnectDialogEdit.ui
+++ b/src/mumble/ConnectDialogEdit.ui
@@ -6,21 +6,105 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>265</width>
-    <height>197</height>
+    <width>430</width>
+    <height>272</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>430</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Edit Server</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
+   <item row="1" column="0" colspan="2">
+    <widget class="QWidget" name="qwInlineNotice" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="qlPasteNotice">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>4</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="qwActions" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <layout class="QVBoxLayout" name="qlActions">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QPushButton" name="qbFill">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>&amp;Fill</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="qbDiscard">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string notr="true">&amp;Ignore</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
     <widget class="QLabel" name="qliServer">
      <property name="text">
       <string>A&amp;ddress</string>
@@ -30,7 +114,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <widget class="QLineEdit" name="qleServer">
      <property name="toolTip">
       <string>Internet address of the server.</string>
@@ -44,7 +128,7 @@ Internet address of the server. This can be a normal hostname, an IPv4/IPv6 addr
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="qliPort">
      <property name="text">
       <string>&amp;Port</string>
@@ -54,7 +138,7 @@ Internet address of the server. This can be a normal hostname, an IPv4/IPv6 addr
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <widget class="QLineEdit" name="qlePort">
      <property name="toolTip">
       <string>Port on which the server is listening</string>
@@ -68,7 +152,7 @@ Port on which the server is listening. If the server is identified by a Bonjour
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="qliUsername">
      <property name="text">
       <string>&amp;Username</string>
@@ -78,14 +162,17 @@ Port on which the server is listening. If the server is identified by a Bonjour
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="qliPassword">
      <property name="text">
       <string>Password</string>
      </property>
+     <property name="buddy">
+      <cstring>qlePassword</cstring>
+     </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="5" column="1">
     <widget class="QLineEdit" name="qleUsername">
      <property name="toolTip">
       <string>Username to send to the server</string>
@@ -99,14 +186,14 @@ Username to send to the server. Be aware that the server can impose restrictions
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
+   <item row="9" column="1">
     <widget class="QDialogButtonBox" name="qdbbButtonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="6" column="1">
     <widget class="QLineEdit" name="qlePassword">
      <property name="toolTip">
       <string>Password to send to the server</string>
@@ -120,7 +207,7 @@ Password to be sent to the server on connect. This password is needed when conne
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
+   <item row="8" column="1">
     <widget class="QCheckBox" name="qcbShowPassword">
      <property name="toolTip">
       <string/>
@@ -130,7 +217,7 @@ Password to be sent to the server on connect. This password is needed when conne
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="qliName">
      <property name="text">
       <string>Label</string>
@@ -140,7 +227,7 @@ Password to be sent to the server on connect. This password is needed when conne
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="7" column="1">
     <widget class="QLineEdit" name="qleName">
      <property name="toolTip">
       <string>Name of the server</string>
@@ -174,8 +261,8 @@ Label of the server. This is what the server will be named like in your server l
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>112</x>
-     <y>123</y>
+     <x>175</x>
+     <y>231</y>
     </hint>
     <hint type="destinationlabel">
      <x>50</x>
@@ -190,8 +277,8 @@ Label of the server. This is what the server will be named like in your server l
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>191</x>
-     <y>128</y>
+     <x>254</x>
+     <y>231</y>
     </hint>
     <hint type="destinationlabel">
      <x>224</x>
diff --git a/src/mumble/Themes.cpp b/src/mumble/Themes.cpp
index a62b6731353..25112d23335 100644
--- a/src/mumble/Themes.cpp
+++ b/src/mumble/Themes.cpp
@@ -155,5 +155,5 @@ bool Themes::readStylesheet(const QString &stylesheetFn, QString &stylesheetCont
 }
 
 QString Themes::getDefaultStylesheet() {
-	return QLatin1String(".log-channel{text-decoration:none;}.log-user{text-decoration:none;}p{margin:0;}#qwMacWarning{background-color:#FFFEDC;border-radius:5px;border:1px solid #B5B59E;}");
+	return QLatin1String(".log-channel{text-decoration:none;}.log-user{text-decoration:none;}p{margin:0;}#qwMacWarning,#qwInlineNotice{background-color:#FFFEDC;border-radius:5px;border:1px solid #B5B59E;}");
 }