diff --git a/lib/larch/imap.rb b/lib/larch/imap.rb
index a3fa685..644b830 100644
--- a/lib/larch/imap.rb
+++ b/lib/larch/imap.rb
@@ -147,6 +147,9 @@ def mailbox(name, delim = '/')
     #Rackspace namespaces everything under INDEX.
     name.sub!(/^|inbox\./i, "INBOX.") if @quirks[:rackspace] && name != 'INBOX'
 
+    #OVH namespaces everything under INDEX.
+    name.sub!(/^|inbox\./i, "INBOX.") if @quirks[:ovh] && name != 'INBOX'
+
     begin
       @mailboxes.fetch(name) do
         update_mailboxes
@@ -271,6 +274,10 @@ def check_quirks
     elsif host =~ /emailsrvr\.com/
       @quirks[:rackspace] = true
       debug "looks like Rackspace Mail"
+
+    elsif host =~ /ovh\.net/
+      @quirks[:ovh] = true
+      debug "looks like OVH"
     end
   end