diff --git a/lib/postmark.rb b/lib/postmark.rb
index fb0096e..dcace6f 100644
--- a/lib/postmark.rb
+++ b/lib/postmark.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "postmark/version"
 
 def require_local(file)
diff --git a/lib/postmark/attachments_fix_for_mail.rb b/lib/postmark/attachments_fix_for_mail.rb
index 2ab8a5f..ed8831e 100644
--- a/lib/postmark/attachments_fix_for_mail.rb
+++ b/lib/postmark/attachments_fix_for_mail.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Postmark
   
   #
@@ -40,4 +42,4 @@ def remove_postmark_attachments_from_standard_fields
     
   end
   
-end
\ No newline at end of file
+end
diff --git a/lib/postmark/bounce.rb b/lib/postmark/bounce.rb
index 344f7ce..22539a8 100644
--- a/lib/postmark/bounce.rb
+++ b/lib/postmark/bounce.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'time'
 
 module Postmark
diff --git a/lib/postmark/handlers/mail.rb b/lib/postmark/handlers/mail.rb
index 6b311c4..394bbc4 100644
--- a/lib/postmark/handlers/mail.rb
+++ b/lib/postmark/handlers/mail.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mail
   class Postmark
     
@@ -13,4 +15,4 @@ def deliver!(mail)
     end
     
   end
-end
\ No newline at end of file
+end
diff --git a/lib/postmark/http_client.rb b/lib/postmark/http_client.rb
index b6fe050..58a0bd7 100644
--- a/lib/postmark/http_client.rb
+++ b/lib/postmark/http_client.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'cgi'
 
 module Postmark
diff --git a/lib/postmark/json.rb b/lib/postmark/json.rb
index 1a2d646..052c8ff 100644
--- a/lib/postmark/json.rb
+++ b/lib/postmark/json.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Postmark
   module Json
 
diff --git a/lib/postmark/message_extensions/mail.rb b/lib/postmark/message_extensions/mail.rb
index aa38fa5..8d65127 100644
--- a/lib/postmark/message_extensions/mail.rb
+++ b/lib/postmark/message_extensions/mail.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Mail
   class Message
     
@@ -24,4 +26,4 @@ def body_text
     end
     
   end
-end
\ No newline at end of file
+end
diff --git a/lib/postmark/message_extensions/shared.rb b/lib/postmark/message_extensions/shared.rb
index 79597fb..3a967c1 100644
--- a/lib/postmark/message_extensions/shared.rb
+++ b/lib/postmark/message_extensions/shared.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Postmark
   module SharedMessageExtensions
   
@@ -30,4 +32,4 @@ def postmark_attachments
     end
   
   end
-end
\ No newline at end of file
+end
diff --git a/lib/postmark/message_extensions/tmail.rb b/lib/postmark/message_extensions/tmail.rb
index 04a561f..5d20988 100644
--- a/lib/postmark/message_extensions/tmail.rb
+++ b/lib/postmark/message_extensions/tmail.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 ##
 # author: http://fernandoguillen.info
 # date: 2008-08-27
diff --git a/lib/postmark/response_parsers/active_support.rb b/lib/postmark/response_parsers/active_support.rb
index 115c384..652eb20 100644
--- a/lib/postmark/response_parsers/active_support.rb
+++ b/lib/postmark/response_parsers/active_support.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # assume activesupport is already loaded
 module Postmark
   module ResponseParsers
diff --git a/lib/postmark/response_parsers/json.rb b/lib/postmark/response_parsers/json.rb
index 640aa84..6491a59 100644
--- a/lib/postmark/response_parsers/json.rb
+++ b/lib/postmark/response_parsers/json.rb
@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 require 'json'
+
 module Postmark
   module ResponseParsers
     module Json
diff --git a/lib/postmark/response_parsers/yajl.rb b/lib/postmark/response_parsers/yajl.rb
index bafed3c..2e95ea6 100644
--- a/lib/postmark/response_parsers/yajl.rb
+++ b/lib/postmark/response_parsers/yajl.rb
@@ -1,5 +1,9 @@
+# encoding: utf-8
+
 require 'yajl'
+
 Yajl::Encoder.enable_json_gem_compatability
+
 module Postmark
   module ResponseParsers
     module Yajl
@@ -8,4 +12,4 @@ def self.decode(data)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/postmark/version.rb b/lib/postmark/version.rb
index 4db728c..e3812a2 100644
--- a/lib/postmark/version.rb
+++ b/lib/postmark/version.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Postmark
   VERSION = "0.0.1"
 end
diff --git a/spec/bounce_spec.rb b/spec/bounce_spec.rb
index 8660bed..a424bf8 100644
--- a/spec/bounce_spec.rb
+++ b/spec/bounce_spec.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe "Bounce" do
diff --git a/spec/postmark_spec.rb b/spec/postmark_spec.rb
index ab9a468..44b2441 100644
--- a/spec/postmark_spec.rb
+++ b/spec/postmark_spec.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe "Postmark" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 79ecfd1..fa52f07 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'