diff --git a/.gitignore b/.gitignore
index 88becdaa6..2b228461b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 config.make
 tags
 */obj/
+*._*
 */*/obj/
 */*/*/obj/
 */*/*.SOGo/
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index afa832c3e..f53f19a21 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -204,6 +204,7 @@
 "Mail" = "Mail";
 "Last" = "Last used";
 "Default module :" = "Default module:";
+"SOGo version:" = "SOGo version:";
 
 "Language :" = "Language:";
 "choose" = "Choose ...";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index b3d49aab2..0f0f55535 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -204,6 +204,7 @@
 "Mail" = "Courrier";
 "Last" = "Dernier utilisé";
 "Default module :" = "Module par défaut :";
+"SOGo version:" = "SOGo version:";
 
 "Language :" = "Langue :";
 "choose" = "Choisir ...";
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index d95e6fd34..70594b952 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -46,6 +46,7 @@
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/WOResourceManager+SOGo.h>
+#import <SOGo/SOGoBuild.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>
 #import <Mailer/SOGoMailLabel.h>
@@ -1137,6 +1138,14 @@ static NSArray *reminderValues = nil;
     }
 }
 
+- (NSString *) sogoVersion
+{
+  // The variable SOGoVersion comes from the import: SOGo/Build.h
+  NSString *sogoVersion = [NSString stringWithString: SOGoVersion];
+  
+  return sogoVersion;
+}
+
 - (id <WOActionResults>) defaultAction
 {
   id <WOActionResults> results;
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 66f69b6a9..f626accb2 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -124,6 +124,8 @@
       <div class="tabs">
         <div id="generalView" class="tab">
           <dl class="dl-horizontal">
+            <dt><var:string label:value="SOGo version:"/></dt>
+            <dd><var:string value="sogoVersion"/></dd>
             <dt><var:string label:value="Language :"/></dt>
             <dd><var:popup list="languages" item="item"
                   const:id="language"