diff --git a/src/common/config.py b/src/common/config.py
index 89799ff81..5d1ae7428 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -158,7 +158,7 @@ class Config:
 		'show_unread_tab_icon': [opt_bool, False, _('If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated.')],
 		'show_status_msgs_in_roster': [opt_bool, True, _('If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window')],
 		'show_avatars_in_roster': [opt_bool, True],
-		'print_status_in_chats': [opt_bool, True, _('If False, you will no longer see status line in chats when a contact changes his status and/or his status message.')],
+		'print_status_in_chats': [opt_bool, True, _('If False, you will no longer see status line in chats when a contact changes his or her status and/or his status message.')],
 	}
 
 	__options_per_key = {
diff --git a/src/gajim.py b/src/gajim.py
index b23ef00ce..40dfdd6ed 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -554,7 +554,7 @@ class Interface:
 			gajim.contacts[account][jid] = [contact1]
 			self.roster.add_contact_to_roster(jid, account)
 		dialogs.InformationDialog(_('Authorization accepted'),
-				_('The contact "%s" has authorized you to see his status.')
+				_('The contact "%s" has authorized you to see his or her status.')
 				% jid)
 		if self.remote and self.remote.is_enabled():
 			self.remote.raise_signal('Subscribed', (account, array))
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index 50a43f556..5d1256fd8 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -423,7 +423,7 @@ class GroupchatWindow(chat.Chat):
 
 	def chg_contact_status(self, room_jid, nick, show, status, role, affiliation,
 		jid, reason, actor, statusCode, new_nick, account):
-		'''When a user changes his status'''
+		'''When a user changes his or her status'''
 		if show == 'invisible':
 			return
 		if not role:
@@ -454,7 +454,7 @@ class GroupchatWindow(chat.Chat):
 						'who': actor,
 						'reason': reason }
 				self.print_conversation(s, room_jid)
-			elif statusCode == '303': # Someone changed his nick
+			elif statusCode == '303': # Someone changed his or her nick
 				if nick == self.nicks[room_jid]: # We changed our nick
 					self.nicks[room_jid] = new_nick
 					s = _('You are now known as %s') % new_nick
diff --git a/src/roster_window.py b/src/roster_window.py
index 4dbe8228d..199c6c234 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -653,7 +653,7 @@ class RosterWindow:
 				gajim.groups[account][g] = { 'expand': ishidden }
 
 	def chg_contact_status(self, contact, show, status, account):
-		'''When a contact changes his status'''
+		'''When a contact changes his or her status'''
 		showOffline = gajim.config.get('showoffline')
 		model = self.tree.get_model()
 		contact_instances = gajim.contacts[account][contact.jid]
@@ -1203,7 +1203,7 @@ class RosterWindow:
 			user1 = gajim.get_contact_instance_with_highest_priority(account, jid)
 			if not _('not in the roster') in user1.groups:
 				dialogs.InformationDialog(_('Subscription request has been sent'),
-_('If "%s" accepts this request you will know his status.') %jid)
+_('If "%s" accepts this request you will know his or her status.') %jid)
 				return
 			user1.groups = [group]
 			user1.name = pseudo