diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index eefdc1b..5349636 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -338,7 +338,18 @@ class CmsController < MyProfileController
   def search
     query = params[:q]
     results = query.blank? ? [] : profile.articles.published.find_by_contents(query)
-    render :text => results.map { |item| { 'title' => item.title, 'url' => url_for(item.url), :icon => icon_for_article(item), :content_type => item.mime_type }}.to_json, :content_type => 'application/json'
+    render :text => article_list_to_json(results), :content_type => 'application/json'
+  end
+  def media_upload
+    files_uploaded = []
+    parent = check_parent(params[:parent_id])
+    files = [:file1,:file2, :file3].map { |f| params[f] }
+    if request.post?
+      files.each do |file|
+        files_uploaded << UploadedFile.create(:uploaded_data => file, :profile => profile, :parent => parent) unless file == ''
+      end
+    end
+    render :text => article_list_to_json(files_uploaded), :content_type => 'application/json'
   end
 
   protected
@@ -386,5 +397,16 @@ class CmsController < MyProfileController
     @selected_locale = @article.language || FastGettext.locale
   end
 
+  def article_list_to_json(list)
+    list.map do |item|
+      {
+        'title' => item.title,
+        'url' => url_for(item.url),
+        :icon => icon_for_article(item),
+        :content_type => item.mime_type
+      }
+    end.to_json
+  end
+
 end
 
diff --git a/app/views/cms/_textile_media.rhtml b/app/views/cms/_textile_media.rhtml
index 1bab4b6..03fae43 100644
--- a/app/views/cms/_textile_media.rhtml
+++ b/app/views/cms/_textile_media.rhtml
@@ -18,31 +18,43 @@
       <p><%= _('See also a more complete <a href="%s">Textile Reference</a>') % 'http://redcloth.org/hobix.com/textile/' %></p>
     </div>
   </div>
-  <div class='textile-editor-sidebar-box'>
+  <div class='textile-editor-sidebar-box' id='media-upload-box'>
     <p><strong>Media upload</strong></p>
-    <% @folders = profile.folders %>
-    <% form_tag({ :action => 'media_upload' }, :multipart => true) do |f| %>
-      <%= render :partial => 'upload_file_form', :locals => { :size => 30 } %>
-    <% end %>
-    <div id='media-upload-results' style='display: none'>
+    <div id='media-upload-form'>
+      <% form_tag({ :action => 'media_upload' }, :multipart => true) do |f| %>
+        <div class='formfield'>
+          <%# TODO duplicated from partial upload_file_form %>
+          <%= labelled_form_field(_('Choose folder to upload files:'), select_tag('parent_id', options_for_select([[profile.identifier, '']] + profile.folders.collect {|f| [ profile.identifier + '/' +  f.full_name, f.id ] }))) %>
+        </div>
+        <p><%= file_field_tag('file1') %></p>
+        <p><%= file_field_tag('file2') %></p>
+        <p><%= file_field_tag('file3') %></p>
+        <% button_bar do %>
+          <%= submit_button(:save, _('Upload')) %>
+        <% end %>
+      <% end %>
+    </div>
+    <div id='media-upload-results' class='media-list-results' style='display: none'>
       <ul>
       </ul>
       <p>
       <em><%= _('Drag item names to the text to add their URL') %></em>
       </p>
-      <p><%= link_to('#', _('Upload more files'), :id => 'media-upload-more-files') %></p>
+      <p><%= link_to(_('Upload more files ...'), '#', :id => 'media-upload-more-files')%></p>
     </div>
   </div>
   <div class='textile-editor-sidebar-box'>
     <p><strong>Media search</strong></p>
     <% form_tag({ :action => 'search' }) do %>
-      <span class='formfield'>
-        <input name='q' type='text' id='media-search-query' style='width: 250px;'/>
-      </span>
-      <%= submit_button :search, _('Search'), :id => 'media-search-button' %>
+      <% button_bar do %>
+        <span class='formfield'>
+          <input name='q' type='text' id='media-search-query' style='width: 250px;'/>
+        </span>
+        <%= submit_button :search, _('Search'), :id => 'media-search-button' %>
+      <% end %>
     <% end %>
     </form>
-    <div id='media-search-results' style='display: none'>
+    <div id='media-search-results' class='media-list-results' style='display: none'>
       <ul>
       </ul>
       <p>
diff --git a/public/javascripts/article.js b/public/javascripts/article.js
index 7eb600b..24108bc 100644
--- a/public/javascripts/article.js
+++ b/public/javascripts/article.js
@@ -39,13 +39,34 @@ jQuery(function($) {
     var $button = $(this);
     $button.toggleClass('icon-loading');
     $.get($(this).parent().attr('action'), { 'q': query }, function(data) {
-      $button.toggleClass('icon-loading');
       insert_items(data, '#media-search-results ul');
       if (data.length && data.length > 0) {
         $('#media-search-results').slideDown();
       }
+      $button.toggleClass('icon-loading');
     });
     return false;
   });
+  $('#media-upload-form form').ajaxForm({
+    dataType: 'json',
+    resetForm: true,
+    beforeSubmit:
+      function() {
+        $('#media-upload-form').slideUp();
+        $('#media-upload-box').toggleClass('icon-loading');
+      },
+    success:
+      function(data) {
+        insert_items(data, '#media-upload-results ul');
+        if (data.length && data.length > 0) {
+          $('#media-upload-results').slideDown();
+        }
+        $('#media-upload-box').toggleClass('icon-loading');
+      }
+  });
+  $('#media-upload-more-files').click(function() {
+    $('#media-upload-results').hide();
+    $('#media-upload-form').show();
+  });
 
 });
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3330a86..b633527 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3396,11 +3396,11 @@ div.with_media_panel .formfield input {
 .textile-editor-sidebar .icon-loading {
   background-image: url(../images/loading-small.gif);
 }
-.textile-editor-sidebar #media-search-results ul {
+.textile-editor-sidebar .media-list-results ul {
   padding: 0px;
   list-style: none;
 }
-.textile-editor-sidebar #media-search-results li {
+.textile-editor-sidebar .media-list-results li {
   background-repeat: no-repeat;
   background-position: 0px 0px;
   padding-left: 20px;
@@ -3409,11 +3409,14 @@ div.with_media_panel .formfield input {
   border: none;
   margin-bottom: 2px;
 }
-.textile-editor-sidebar #media-search-results li:hover {
+.textile-editor-sidebar .media-list-results li:hover {
   background-color: transparent;
   border: none;
 }
-
+.textile-editor-sidebar #media-upload-box {
+  background-repeat: no-repeat;
+  background-position: top right ;
+}
 
 /* ==> public/stylesheets/controller_contact.css <== */
 /*** SELECT CITY ***/
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index e5ede13..555150a 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -1631,4 +1631,23 @@ class CmsControllerTest < Test::Unit::TestCase
     assert_match /text/, data.first['content_type']
   end
 
+  should 'upload media by AJAX' do
+    post :media_upload, :profile => profile.identifier, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain'), fixture_file_upload('/files/rails.png', 'image/png')]
+    assert_match 'test.txt', @response.body
+    assert_equal 'application/json', @response.content_type
+
+    data = eval(@response.body.gsub('":', '"=>'))
+
+    assert_equal 'test.txt', data[0]['title']
+    assert_match /\/testinguser\/test.txt$/, data[0]['url']
+    assert_match /text/, data[0]['icon']
+    assert_match /text/, data[0]['content_type']
+
+    assert_equal 'rails.png', data[1]['title']
+    assert_match /\/testinguser\/rails.png$/, data[1]['url']
+    assert_match /png$/, data[1]['icon']
+    assert_match /image/, data[1]['content_type']
+
+  end
+
 end
--
libgit2 0.21.2