diff --git a/app/models/channel/filter/trusted.rb b/app/models/channel/filter/trusted.rb
index 3f6e84f14..131b3371a 100644
--- a/app/models/channel/filter/trusted.rb
+++ b/app/models/channel/filter/trusted.rb
@@ -8,9 +8,10 @@ module Channel::Filter::Trusted
     # check if trust x-headers
     if !channel[:trusted]
       mail.each {|key, _value|
-        if key =~ /^x-zammad/i
-          mail.delete(key)
-        end
+
+        next if key !~ /^x-zammad/i
+
+        mail.delete(key)
       }
     end
 
diff --git a/app/models/ticket/number/increment.rb b/app/models/ticket/number/increment.rb
index 2a3d241b7..e5f44edce 100644
--- a/app/models/ticket/number/increment.rb
+++ b/app/models/ticket/number/increment.rb
@@ -31,11 +31,12 @@ module Ticket::Number::Increment
       min_digs = min_digs.to_i - 1
     end
     fillup = Setting.get('system_id') || '1'
-    ( 1..100 ).each do |_i|
-      if ( fillup.length.to_i + counter_increment.to_s.length.to_i ) < min_digs.to_i
-        fillup = fillup + '0'
-      end
-    end
+    ( 1..100 ).each {
+
+      next if ( fillup.length.to_i + counter_increment.to_s.length.to_i ) >= min_digs.to_i
+
+      fillup = fillup + '0'
+    }
     number = fillup.to_s + counter_increment.to_s
 
     # calculate a checksum