Revert to original encoder and rescue

Another alternative spec-passing change

Author: garethrees

lib/mapi/mime.rb

@@ -106,8 +106,13 @@ def to_s opts={}
   		opts = {:boundary_counter => 0}.merge opts
   		if multipart?
   			boundary = Mime.make_boundary opts[:boundary_counter] += 1, self
-  			@body = [preamble, parts.map { |part| "\r\n" + part.to_s(opts) + "\r\n" }, "--\r\n" + epilogue].
-  				flatten.join("\r\n--" + boundary)
+        begin
+          @body = [preamble, parts.map { |part| "\r\n" + part.to_s(opts) + "\r\n" }, "--\r\n" + epilogue].
+            flatten.join("\r\n--" + boundary)
+        rescue Encoding::CompatibilityError
+          @body = [preamble, parts.map { |part| "\r\n" + part.to_s(opts).force_encoding('ASCII-8BIT') + "\r\n" }, "--\r\n" + epilogue].
+            flatten.join("\r\n--" + boundary)
+        end
   			content_type, attrs = Mime.split_header @headers['Content-Type'][0]
   			attrs['boundary'] = boundary
   			@headers['Content-Type'] = [([content_type] + attrs.map { |key, val| %{#{key}="#{val}"} }).join('; ')]

lib/mapi/msg.rb

@@ -101,7 +101,7 @@ class PropertyStore
 			# change these to use mapi symbolic const names
 			ENCODINGS = {
 				0x000d =>   proc { |obj| obj }, # seems to be used when its going to be a directory instead of a file. eg nested ole. 3701 usually. in which case we shouldn't get here right?
-				0x001f =>   proc { |obj| Ole::Types::FROM_UTF16.iconv(obj.read).force_encoding('ASCII-8BIT') }, # unicode
+				0x001f =>   proc { |obj| Ole::Types::FROM_UTF16.iconv obj.read }, # unicode
 				# ascii
 				# FIXME hack did a[0..-2] before, seems right sometimes, but for some others it chopped the text. chomp
 				0x001e =>   proc { |obj| obj.read.chomp 0.chr },