diff --git a/src/chat_control.py b/src/chat_control.py
index d78a7f1c5..3474895a4 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -151,7 +151,7 @@ class ChatControlBase(MessageControl):
 			self._on_banner_eventbox_button_press_event)
 		self.handlers[id] = widget
 
-		self.urlfinder = re.compile("(https?://|www|ftp)[^ ]+")
+		self.urlfinder = re.compile(r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]")
 
 		if gajim.HAVE_PYSEXY:
 			import sexy
diff --git a/src/gajim.py b/src/gajim.py
index d268e0ae2..4453ab8be 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -2328,7 +2328,7 @@ class Interface:
 
 		#FIXME: recognize xmpp: and treat it specially
 
-		links = r'\b(%s)\S*[\w\/\=]|' % prefixes
+		links = r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]"
 		#2nd one: at_least_one_char@at_least_one_char.at_least_one_char
 		mail = r'\bmailto:\S*[^\s\W]|' r'\b\S+@\S+\.\S*[^\s\W]'
 
@@ -2340,7 +2340,7 @@ class Interface:
 
 		latex = r'|\$\$[^$\\]*?([\]\[0-9A-Za-z()|+*/-]|[\\][\]\[0-9A-Za-z()|{}$])(.*?[^\\])?\$\$'
 
-		basic_pattern = links + mail
+		basic_pattern = links + '|' + mail
 
 		if gajim.config.get('use_latex'):
 			basic_pattern += latex