<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -7,6 +7,8 @@ class User &lt; ActiveRecord::Base
   has_many :sent_messages, :class_name =&gt; &quot;Message&quot;, :foreign_key =&gt; &quot;from_user_id&quot;, :dependent =&gt; :destroy
   has_many :received_messages, :class_name =&gt; &quot;Message&quot;, :foreign_key =&gt; &quot;to_user_id&quot;, :dependent =&gt; :destroy
 
+  after_save :create_default_folders!
+  
   def get_message(id)
     begin
     sent_messages.find(id)
@@ -15,14 +17,18 @@ class User &lt; ActiveRecord::Base
     end
   end
 
+  private 
+
   def create_default_folders!
-    default_folders = Tog::Config[&quot;plugins.tog_mail.messages.default_folders&quot;] || &quot;&quot;
-    default_folders.each(&quot; &quot;){|folder_type|
-      folder_type.strip!
-      unless self.folders.find_by_name(folder_type)
-        self.folders.create(:name =&gt; folder_type, :deletable =&gt; false, :folder_type =&gt; folder_type)
-      end
-    }
+    if self.recently_activated?
+      default_folders = Tog::Config[&quot;plugins.tog_mail.messages.default_folders&quot;] || &quot;&quot;
+      default_folders.each(&quot; &quot;){|folder_type|
+        folder_type.strip!
+        unless self.folders.find_by_name(folder_type)
+          self.folders.create(:name =&gt; folder_type, :deletable =&gt; false, :folder_type =&gt; folder_type)
+        end
+      }
+    end
   end
 
 end</diff>
      <filename>app/models/user.rb</filename>
    </modified>
    <modified>
      <diff>@@ -8,6 +8,4 @@ end
 Tog::Plugins.settings :tog_mail, &quot;messages.default_folders&quot;   =&gt; &quot;Inbox Outbox&quot;,
                                  &quot;messages_list.size&quot;         =&gt; &quot;10&quot;
 
-Tog::Interface.sections(:member).add &quot;Messages&quot;, &quot;/member/messages&quot;   
-       
-Tog::Plugins.observers &lt;&lt; :mail_user_observer
+Tog::Interface.sections(:member).add &quot;Messages&quot;, &quot;/member/messages&quot;
\ No newline at end of file</diff>
      <filename>init.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>app/models/mail_user_observer.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>e73bd9232de879b5d86fb75dc47dfb91527ba068</id>
    </parent>
  </parents>
  <author>
    <name>Aitor Garc&#237;a</name>
    <email>aitor.garcia@gmail.com</email>
  </author>
  <url>http://github.com/tog/tog_mail/commit/0772b021a8ea6ee7cacbd304b179b48c94f0232e</url>
  <id>0772b021a8ea6ee7cacbd304b179b48c94f0232e</id>
  <committed-date>2009-06-10T15:19:35-07:00</committed-date>
  <authored-date>2009-06-10T15:19:35-07:00</authored-date>
  <message>moved from observer to active record filters. Observer support in pluggins</message>
  <tree>3ff5546b6570b96fe976778a6963923ec58dc310</tree>
  <committer>
    <name>Aitor Garc&#237;a</name>
    <email>aitor.garcia@gmail.com</email>
  </committer>
</commit>
