diff --git a/src/common/connection.py b/src/common/connection.py
index c6e8ce43a..e396798e7 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1476,11 +1476,14 @@ class Connection:
 			return -1
 		sshow = helpers.get_xmpp_show(show)
 		if not msg:
+			msg = ''
+		keyID = gajim.config.get_per('accounts', self.name, 'keyid')
+		if keyID and USE_GPG and not msg:
 			lowered_uf_status_msg = helpers.get_uf_show(show).lower()
-			if lowered_uf_status_msg == _('invisible'): # do not show I'm invisible!
+			# do not show I'm invisible!
+			if lowered_uf_status_msg == _('invisible'):
 				lowered_uf_status_msg = _('offline')
 			msg = _("I'm %s") % lowered_uf_status_msg
-
 		signed = ''
 		if not auto and not show == 'offline':
 			signed = self.get_signed_msg(msg)
diff --git a/src/roster_window.py b/src/roster_window.py
index 35d2e5109..c0aa261fb 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1258,8 +1258,7 @@ _('If "%s" accepts this request you will know his status.') %jid)
 	def get_status_message(self, show):
 		if (show == 'online' and not gajim.config.get('ask_online_status')) or \
 			(show == 'offline' and not gajim.config.get('ask_offline_status')):
-			lowered_uf_status_msg = helpers.get_uf_show(show).lower()
-			return _("I'm %s") % lowered_uf_status_msg
+			return ''
 		dlg = dialogs.ChangeStatusMessageDialog(self.plugin, show)
 		message = dlg.run()
 		return message