diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e431e1c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.yaml
+*.pstore
+spool
+.bundle
diff --git a/folder.rb b/folder.rb
index a2502ee..9882898 100644
--- a/folder.rb
+++ b/folder.rb
@@ -65,7 +65,7 @@ class Folder
       message = @submissions.sample
       i = i + 1
     end
-    if i == 5
+    if i == 5 or message.sender == target
       return nil
     end
     @submissions.delete(message)
diff --git a/main.rb b/main.rb
index b32fccd..a19be3a 100755
--- a/main.rb
+++ b/main.rb
@@ -52,13 +52,8 @@ bot.message(private: true, contains: "!folder status") do |event|
 end
 
 bot.message(private: true) do |event|
-  (mem,au) = event.author
+  sender = event.author.id
   i = 1
-  if mem == nil
-    sender = au.username
-  else
-    sender = mem.username
-  end
   event.message.attachments.each do |file|
     res =  MimeMagic.by_path(file.filename)
     if res != nil