diff --git a/db/migrate/20140820173129_create_chat_messages.rb b/db/migrate/20140820173129_create_chat_messages.rb
new file mode 100644
index 0000000..6193098
--- /dev/null
+++ b/db/migrate/20140820173129_create_chat_messages.rb
@@ -0,0 +1,15 @@
+class CreateChatMessages < ActiveRecord::Migration
+  def up
+    create_table :chat_messages do |t|
+      t.integer :to_id
+      t.integer :from_id
+      t.string :body
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :chat_messages
+  end
+end
diff --git a/db/migrate/20141014205254_change_chat_messages_columns_and_add_indexes.rb b/db/migrate/20141014205254_change_chat_messages_columns_and_add_indexes.rb
new file mode 100644
index 0000000..51c9128
--- /dev/null
+++ b/db/migrate/20141014205254_change_chat_messages_columns_and_add_indexes.rb
@@ -0,0 +1,23 @@
+class ChangeChatMessagesColumnsAndAddIndexes < ActiveRecord::Migration
+  def up
+    change_table :chat_messages do |t|
+      t.change :from_id, :integer, :null => false
+      t.change :to_id, :integer, :null => false
+      t.change :body, :text
+    end
+    add_index :chat_messages, :from_id
+    add_index :chat_messages, :to_id
+    add_index :chat_messages, :created_at
+  end
+
+  def down
+    remove_index :chat_messages, :from_id
+    remove_index :chat_messages, :to_id
+    remove_index :chat_messages, :created_at
+    change_table :chat_messages do |t|
+      t.change :from_id, :integer, :null => true
+      t.change :to_id, :integer, :null => true
+      t.change :body, :string
+    end
+  end
+end
diff --git a/db/migrate/20141014205254_create_chat_messages.rb b/db/migrate/20141014205254_create_chat_messages.rb
deleted file mode 100644
index 66ace71..0000000
--- a/db/migrate/20141014205254_create_chat_messages.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class CreateChatMessages < ActiveRecord::Migration
-  def up
-    create_table :chat_messages do |t|
-      t.references :from, :null => false
-      t.references :to, :null => false
-      t.text   :body
-      t.timestamps
-    end
-    add_index :chat_messages, :from_id
-    add_index :chat_messages, :to_id
-    add_index :chat_messages, :created_at
-  end
-
-  def down
-    remove_index :chat_messages, :from_id
-    remove_index :chat_messages, :to_id
-    remove_index :chat_messages, :created_at
-    drop_table :chat_messages
-  end
-end
--
libgit2 0.21.2