diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 6836293261f842a36e99ce99431957b5088da879..6a0004ec2ae8f4dcddda78b5b67d6f171198ba68 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -418,7 +418,7 @@ def on_textview_button_press_event(self, widget, event):
 		if tags: # we clicked on sth special (it can be status message too)
 			for tag in tags:
 				tag_name = tag.get_property('name')
-				if tag_name is not None and tag_name in ('url', 'mail'):
+				if tag_name in ('url', 'mail'):
 					return True # we block normal context menu
 
 		# we check if sth was selected and if it was we assign
diff --git a/src/htmltextview.py b/src/htmltextview.py
index 12dfd51f1322657d48604dffb0508d066c2d045d..e26b49252ce24c1878e5c7f02c2898db52ac4a68 100644
--- a/src/htmltextview.py
+++ b/src/htmltextview.py
@@ -508,7 +508,7 @@ def _begin_span(self, style, tag=None, id_=None):
 			if id_:
 				tag = self.textbuf.create_tag(id_)
 			else:
-				tag = self.textbuf.create_tag('span with no id')
+				tag = self.textbuf.create_tag() # we create anonymous tag
 		for attr, val in [item.split(':', 1) for item in style.split(';') if len(item.strip())]:
 			attr = attr.strip().lower()
 			val = val.strip()