diff --git a/composer.lock b/composer.lock
index 31c4ee91d..e53834994 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1407,23 +1407,24 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.12",
+            "version": "v2.99.99",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
+                "reference": "35469243ebbb9be5086cff57538cac6da2c36852"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/35469243ebbb9be5086cff57538cac6da2c36852",
+                "reference": "35469243ebbb9be5086cff57538cac6da2c36852",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2.0"
+                "php": "^7"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*|5.*"
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
             },
             "suggest": {
                 "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
@@ -1448,10 +1449,11 @@
             "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
             "keywords": [
                 "csprng",
+                "polyfill",
                 "pseudorandom",
                 "random"
             ],
-            "time": "2018-04-04T21:24:14+00:00"
+            "time": "2018-06-06T05:12:00+00:00"
         },
         {
             "name": "pear/net_dns2",
diff --git a/database/migrations/20180606155549_add_jid_to_indexes_to_messages.php b/database/migrations/20180606155549_add_jidto_and_type_indexes_to_messages.php
similarity index 73%
rename from database/migrations/20180606155549_add_jid_to_indexes_to_messages.php
rename to database/migrations/20180606155549_add_jidto_and_type_indexes_to_messages.php
index 4d64730dd..cd395a299 100644
--- a/database/migrations/20180606155549_add_jid_to_indexes_to_messages.php
+++ b/database/migrations/20180606155549_add_jidto_and_type_indexes_to_messages.php
@@ -3,12 +3,13 @@
 use Movim\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
-class AddJidToIndexesToMessages extends Migration
+class AddJidtoAndTypeIndexesToMessages extends Migration
 {
     public function up()
     {
         $this->schema->table('messages', function(Blueprint $table) {
             $table->index('jidto');
+            $table->index('type');
         });
     }
 
@@ -16,6 +17,7 @@ class AddJidToIndexesToMessages extends Migration
     {
         $this->schema->table('messages', function(Blueprint $table) {
             $table->dropIndex('messages_jidto_index');
+            $table->dropIndex('messages_type_index');
         });
 
     }