diff --git a/src/org/yaaic/model/Server.java b/src/org/yaaic/model/Server.java
index 4054555..255be72 100644
--- a/src/org/yaaic/model/Server.java
+++ b/src/org/yaaic/model/Server.java
@@ -37,6 +37,7 @@ public class Server
 	private String host;
 	private int port;
 	private String password;
+	private String charset;
 	private Identity identity;
 	
 	private LinkedHashMap<String, Conversation> conversations = new LinkedHashMap<String, Conversation>();
@@ -173,6 +174,26 @@ public class Server
 		this.port = port;
 	}
 	
+	/**
+	 * Set the charset to be used for all messages sent to the server
+	 * 
+	 * @param charset The name of the charset
+	 */
+	public void setCharset(String charset)
+	{
+		this.charset = charset;
+	}
+	
+	/**
+	 * Get the charset to be used with this server
+	 * 
+	 * @return String charset The name of the charset
+	 */
+	public String getCharset()
+	{
+		return charset;
+	}
+	
 	/**
 	 * Set connection status of server
 	 *