diff --git a/css/webform.css b/css/webform.css
index 2238101..b57ca75 100644
--- a/css/webform.css
+++ b/css/webform.css
@@ -7,6 +7,10 @@ input.webform-calendar {
   padding: 3px;
   vertical-align: top;
 }
+.webform-container-inline label {
+  display: inline;
+  margin-right: 1em;
+}
 .webform-container-inline div,
 .webform-container-inline div.form-item {
   display: inline;
diff --git a/webform.module b/webform.module
index 612adb0..e2de018 100644
--- a/webform.module
+++ b/webform.module
@@ -2384,6 +2384,9 @@ function theme_webform_element($variables) {
    'webform-component',
    'webform-component-' . $type,
   );
+  if (isset($element['#title_display']) && $element['#title_display'] == 'inline') {
+    $wrapper_classes[] = 'webform-container-inline';
+  }
   $output = '<div class="' . implode(' ', $wrapper_classes) . '" id="webform-component-' . $parents . '">' . "\n";
   $required = !empty($element['#required']) ? '<span class="form-required" title="' . t('This field is required.') . '">*</span>' : '';
 
@@ -2395,6 +2398,7 @@ function theme_webform_element($variables) {
   $suffix = isset($element['#field_suffix']) ? ' <span class="field-suffix">' . _webform_filter_xss($element['#field_suffix']) . '</span>' : '';
 
   switch ($element['#title_display']) {
+    case 'inline':
     case 'before':
     case 'invisible':
       $output .= ' ' . theme('form_element_label', $variables);