diff --git a/res/values/settings.xml b/res/values/settings.xml
index c2d6aa5..68ec33e 100644
--- a/res/values/settings.xml
+++ b/res/values/settings.xml
@@ -14,4 +14,7 @@
 	
 	<string name="key_reconnect">reconnect</string>
 	<string name="default_reconnect">false</string>
+	
+	<string name="key_quitmessage">quitmessage</string>
+	<string name="default_quitmessage">Yaaic - Yet another Android IRC client - http://www.yaaic.org</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 551ac2c..1b9cb82 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -53,4 +53,14 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 			android:defaultValue="@string/default_24h_format"
 			android:dependency="@string/key_show_timestamp" />
 	</PreferenceCategory>
+	<PreferenceCategory
+		android:title="Misc">
+		<EditTextPreference
+			android:title="Quit message"
+			android:summary="Message to show when you disconnect"
+			android:key="@string/key_quitmessage"
+			android:defaultValue="@string/default_quitmessage"
+			android:dialogTitle="Quit message"
+			android:dialogMessage="Message to show when you disconnect:" />
+	</PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/org/yaaic/irc/IRCConnection.java b/src/org/yaaic/irc/IRCConnection.java
index 7b16e82..7851b4e 100644
--- a/src/org/yaaic/irc/IRCConnection.java
+++ b/src/org/yaaic/irc/IRCConnection.java
@@ -1102,7 +1102,7 @@ public class IRCConnection extends PircBot
 	{
 		new Thread() {
 			public void run() {
-				quitServer("Yaaic - Yet another Android IRC client - http://www.yaaic.org");
+				quitServer(service.getSettings().getQuitMessage());
 			}
 		}.start();
 	}
diff --git a/src/org/yaaic/model/Settings.java b/src/org/yaaic/model/Settings.java
index 97887dd..159847a 100644
--- a/src/org/yaaic/model/Settings.java
+++ b/src/org/yaaic/model/Settings.java
@@ -36,8 +36,7 @@ import android.preference.PreferenceManager;
  * 		 be gone. Otherwise this could leak memory. 
  * 
  * @author Sebastian Kaspari <sebastian@yaaic.org>
- *
- */
+  */
 public class Settings
 {
 	private SharedPreferences preferences;
@@ -119,4 +118,17 @@ public class Settings
 			Boolean.parseBoolean(resources.getString(R.string.default_reconnect))
 		);
 	}
+	
+	/**
+	 * Get the quit message
+	 * 
+	 * @return The message to display when the user disconnects
+	 */
+	public String getQuitMessage()
+	{
+		return preferences.getString(
+			resources.getString(R.string.key_quitmessage),
+			resources.getString(R.string.default_quitmessage)
+		);
+	}
 }