diff --git a/ChangeLog b/ChangeLog
index 5459e3eb44..ecc0fe893e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun  8 16:08:00 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (fetch_internal): do not quote message data item
+	  names.  Thanks, Eric Hodel.  [ruby-core:23508]  backported form
+	  trunk.
+
 Tue Jun  8 15:45:52 2010  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap (encode_utf7): encode & properly.  Thanks, Kengo
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index bfb00e06b6..662d152207 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -1164,9 +1164,15 @@ module Net
     end
 
     def fetch_internal(cmd, set, attr)
-      if attr.instance_of?(String)
+      case attr
+      when String then
         attr = RawData.new(attr)
+      when Array then
+        attr = attr.map { |arg|
+          arg.is_a?(String) ? RawData.new(arg) : arg
+        }
       end
+
       synchronize do
         @responses.delete("FETCH")
         send_command(cmd, MessageSet.new(set), attr)
diff --git a/version.h b/version.h
index d12f2edab5..ad3c54663c 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 279
+#define RUBY_PATCHLEVEL 280
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8