diff --git a/data/glade/history_window.glade b/data/glade/history_window.glade
index ba74ec04c..30de8e013 100644
--- a/data/glade/history_window.glade
+++ b/data/glade/history_window.glade
@@ -34,7 +34,7 @@
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="tooltip" translatable="yes">Choose the chatlog you want to view. 
-Enter the jid of a groupchat or a contact here. For online accounts you can even enter a a contact's nickname.</property>
+Enter the jid of a groupchat or a contact here. For online accounts you can even enter a contact's nickname.</property>
                         <signal name="activate" handler="on_jid_entry_activate"/>
                       </widget>
                     </child>
diff --git a/src/common/config.py b/src/common/config.py
index e97f1ba33..c3202afb0 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -77,10 +77,10 @@ class Config:
 		'show_transports_group': [ opt_bool, True ],
 		'autoaway': [ opt_bool, True ],
 		'autoawaytime': [ opt_int, 5, _('Time in minutes, after which your status changes to away.') ],
-		'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S with be replaced by current status message, $T by autoaway time.') ],
+		'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoaway time.') ],
 		'autoxa': [ opt_bool, True ],
 		'autoxatime': [ opt_int, 15, _('Time in minutes, after which your status changes to not available.') ],
-		'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S with be replaced by current status message, $T by autoxa time.') ],
+		'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxa time.') ],
 		'ask_online_status': [ opt_bool, False ],
 		'ask_offline_status': [ opt_bool, False ],
 		'last_status_msg_online': [ opt_str, '' ],