diff --git a/chatroom.chatroom.inc b/chatroom.chatroom.inc
index 63908c6..2888d88 100755
--- a/chatroom.chatroom.inc
+++ b/chatroom.chatroom.inc
@@ -33,6 +33,8 @@ class Chatroom {
   protected $latestMessage = FALSE;
 
   protected $onlineUsers = array();
+  
+  protected $archived = FALSE;
 
   public function __construct($cid = FALSE) {
     if ($cid) {
@@ -40,11 +42,13 @@ class Chatroom {
       if ($data) {
         $this->cid = $data->cid;
         $this->public = $data->public;
+        $this->archived = $data->archived;
         $this->title = $data->title;
         $this->format = $data->format ? $data->format : filter_fallback_format();
         $this->loadAllowedRoles();
         $this->loadAllowedUids();
         $this->loadLatestMessage();
+        
       }
     }
   }
@@ -225,6 +229,7 @@ class Chatroom {
       $data = array(
         'title' => $this->title,
         'public' => $this->public,
+        'archived' => $this->archived,
         'uid' => $this->uid,
         'format' => $this->format,
       );
diff --git a/chatroom.module b/chatroom.module
index 1143bf8..0d5153d 100644
--- a/chatroom.module
+++ b/chatroom.module
@@ -103,6 +103,11 @@ function chatroom_field_widget_form(&$form, &$form_state, $field, $instance, $la
           '#type' => 'checkbox',
           '#default_value' => $chatroom->get('public'),
         ),
+        'chatroom_archived' => array(
+          '#title' => t('Is this chatroom archived?'),
+          '#type' => 'checkbox',
+          '#default_value' => $chatroom->get('archived'),
+        ),
         'chatroom_cid' => array(
           '#type' => 'value',
           '#value' => $chatroom->get('cid'),
@@ -155,6 +160,7 @@ function chatroom_field_insert($entity_type, $entity, $field, $instance, $langco
     $chatroom = new Chatroom();
     $chatroom->set('title', $item['chatroom']['chatroom_title']);
     $chatroom->set('public', $item['chatroom']['chatroom_public']);
+    $chatroom->set('archived', $item['chatroom']['chatroom_archived']);
     $chatroom->set('uid', $user->uid);
     $chatroom->set('allowedRids', array($item['chatroom']['chatroom_roles']));
     if (isset($item['chatroom']['chatroom_format'])) {
@@ -175,6 +181,7 @@ function chatroom_field_update($entity_type, $entity, $field, $instance, $langco
     $chatroom = new Chatroom($item['chatroom']['chatroom_cid']);
     $chatroom->set('title', $item['chatroom']['chatroom_title']);
     $chatroom->set('public', $item['chatroom']['chatroom_public']);
+    $chatroom->set('archived', $item['chatroom']['chatroom_archived']);
     $chatroom->set('uid', $user->uid);
     $chatroom->set('allowedRids', array($item['chatroom']['chatroom_roles']));
     if (isset($item['chatroom']['chatroom_format'])) {
@@ -710,7 +717,8 @@ function theme_chatroom_irc($variables) {
     $output .= theme('chatroom_message', array('message' => $message, 'chatroom' => $chatroom));
   }
   $output .= '</div></div>';
-  $output .= theme('chatroom_irc_buttons', array('chatroom' => $chatroom));
+  if(!$chatroom->get('archived'))
+    $output .= theme('chatroom_irc_buttons', array('chatroom' => $chatroom));
   return $output;
 }