diff -r a6ef9729d1d4 DefineWengoOptions.cmake
--- a/DefineWengoOptions.cmake	Mon Aug 18 18:17:50 2008 +0200
+++ b/DefineWengoOptions.cmake	Tue Aug 19 12:16:34 2008 +0200
@@ -38,6 +38,8 @@
 
 option(ENABLE_CRASHREPORT "Enable integrated crashreport system" ON)
 
+option(DISABLE_VOICE_MAIL "Disable voice mail" OFF)
+
 if (WIN32)
 	option(ENABLE_CONSOLE "Force generate of executable with Console Window enabled" OFF)
 	option(FFMPEG_OLD_VERSION "Use the old version of ffmpeg" OFF)
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/CMakeLists.txt
--- a/wengophone/src/presentation/qt/CMakeLists.txt	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/CMakeLists.txt	Tue Aug 19 12:16:34 2008 +0200
@@ -481,6 +481,13 @@
 	statusbar/StatusBarWidget.ui
 )
 
+if (DISABLE_VOICE_MAIL)
+		ow_add_private_definitions(
+			-DDISABLE_VOICE_MAIL
+		)
+		message(STATUS "Voice mail deactivated")
+endif (DISABLE_VOICE_MAIL)
+
 if (APPLE)
 	ow_use_private_frameworks(
 		Cocoa
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/config/QtWengoConfigDialog.cpp
--- a/wengophone/src/presentation/qt/config/QtWengoConfigDialog.cpp	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/config/QtWengoConfigDialog.cpp	Tue Aug 19 12:16:34 2008 +0200
@@ -68,7 +68,9 @@
 	_settingsList += new QtVideoSettings(cWengoPhone, 0);
 	_settingsList += new QtCallForwardSettings(cWengoPhone, 0);
 	_settingsList += new QtNotificationSettings(0);
+#ifndef DISABLE_VOICE_MAIL
 	_settingsList += new QtVoicemailSettings(cWengoPhone, 0);
+#endif
 	_settingsList += new QtSecuritySettings(cWengoPhone, 0);
 	_settingsList += new QtAdvancedSettings(0);
 
diff -r a6ef9729d1d4 wengophone/src/presentation/qt/profilebar/QtProfileBar.cpp
--- a/wengophone/src/presentation/qt/profilebar/QtProfileBar.cpp	Mon Aug 18 18:17:50 2008 +0200
+++ b/wengophone/src/presentation/qt/profilebar/QtProfileBar.cpp	Tue Aug 19 12:16:34 2008 +0200
@@ -117,6 +117,18 @@
 
 	//Nickname label
 	_nicknameLabel = new WengoStyleLabel(this, WengoStyleLabel::Normal);
+#ifdef DISABLE_VOICE_MAIL
+	_nicknameLabel->setPixmaps(
+					QPixmap(), //no start
+					createPixmapWithExpandIndicator("bar_end.png", true), //end
+					//createPixmapWithExpandIndicator("bar_separator.png", true), //end
+					QPixmap(":/pics/profilebar/bar_fill.png"), //fill
+					QPixmap(),  //no start
+					//createPixmapWithExpandIndicator("bar_on_separator_left.png", false), //end
+					createPixmapWithExpandIndicator("bar_end.png", false), //end
+					QPixmap(":/pics/profilebar/bar_on_fill.png") //fill
+					);
+#else	
 	_nicknameLabel->setPixmaps(
 					QPixmap(), //no start
 					createPixmapWithExpandIndicator("bar_separator.png", true), //end
@@ -125,6 +137,7 @@
 					createPixmapWithExpandIndicator("bar_on_separator_left.png", false), //end
 					QPixmap(":/pics/profilebar/bar_on_fill.png") //fill
 					);
+#endif
 	_nicknameLabel->setTextColor(Qt::white);
 
 	//The credit label
@@ -178,6 +191,10 @@
 	SAFE_CONNECT_TYPE(this, SIGNAL(phoneLineCreatedEvent()),
 		SLOT(phoneLineCreatedEventSlot()), Qt::QueuedConnection);
 	
+#ifdef DISABLE_VOICE_MAIL
+	_creditLabel->hide();
+#endif
+
 	reset();
 }